Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cc-wrapper: fix regression for the C compiler wrapper #121527

Merged
merged 3 commits into from
May 3, 2021
Merged

cc-wrapper: fix regression for the C compiler wrapper #121527

merged 3 commits into from
May 3, 2021

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented May 2, 2021 •
edited
Loading

Motivation for this change

#111970 caused a regression: C compiler is now passed a path to the C++ standard library includes
Fixes: #118195
Fixes: #119866
Fixes the original issue behind #111970 (cc @ttuegel)
cc @abbradar as author of the original nostdlib logic 87607af

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

veprbl added 3 commits May 2, 2021 14:00
@veprbl
Revert "cc-wrapper: -nostdlib does not imply -nostdinc++"
96bbe33 
This made C++ standard headers passed to be passed when C compiler is
executed, which is not a correct fix.

This reverts commit 54c7a0f.
@veprbl
cc-wrapper.sh: rename variables cpp -> cxx
d9bad0e 
CPP is the C PreProcessor
CXX is C++
@veprbl
cc-wrapper.sh: make -nostdlib disable the standard C++ library, but n…
11b744b 
…ot its includes

Should be the correct fix for NixOS#111970
@veprbl veprbl requested a review from Ericson2314 as a code owner May 2, 2021 18:17
Ericson2314
Ericson2314 approved these changes May 2, 2021
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the look of this, including the cpp -> cxx.

@ipetkov ipetkov mentioned this pull request May 2, 2021
Closed
@domenkozar
Copy link
Member

cc @jonringer this is needed for fixing a bunch of macOS packages.

jonringer
jonringer approved these changes May 3, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM

(hopefully) not a breaking change :)

@Ericson2314 Ericson2314 merged commit 7b413bf into NixOS:staging May 3, 2021
@lugray
Copy link
Contributor

lugray commented May 5, 2021

Can this be added to nixpkgs-unstable? 54c7a0f, which this fixes, exists on nixpkgs-unstable.

@veprbl
Copy link
Member Author

veprbl commented May 5, 2021

@lugray This is on its course towards that: staging -> staging-next -> master -> nixpkgs-unstable

@lugray
Copy link
Contributor

lugray commented May 5, 2021

Ah, okay. Thanks for explaining the process.

@ldeck
Copy link
Contributor

ldeck commented May 24, 2021

Is this related to NixOS/nix#4621?

@veprbl
Copy link
Member Author

veprbl commented May 24, 2021

@ldeck, no, it's not.

@veprbl veprbl mentioned this pull request Jun 17, 2021
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@Ericson2314 Ericson2314 Ericson2314 approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild
Projects
Staging
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@veprbl @domenkozar @lugray @ldeck @Ericson2314 @jonringer