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.

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

stdenv: Fix gcc -idirafter shell glob in cc-wrapper #74226

Merged
merged 1 commit into from Dec 2, 2019
Merged

stdenv: Fix gcc -idirafter shell glob in cc-wrapper #74226

merged 1 commit into from Dec 2, 2019

Conversation

bhpdt
Copy link

@bhpdt bhpdt commented Nov 26, 2019 •
edited

If an empty string is passed to -idirafter, it breaks gcc. This commit makes
the stdenv less fragile by expanding out the shell glob and ensuring no empty
arguments get passed.

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 nix-review --run "nix-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.
Notify maintainers

cc @Ericson2314

stdenv: Fix gcc -idirafter shell glob in cc-wrapper
5f589d8 
If an empty string is passed to `-idirafter`, it breaks gcc. This commit makes
the stdenv less fragile by expanding out the shell glob and ensuring no empty
arguments get passed.
@ofborg ofborg bot requested review from peti and veprbl November 26, 2019 01:11
@veprbl veprbl added this to WIP in Staging via automation Nov 27, 2019
@veprbl veprbl moved this from WIP to Needs review in Staging Nov 27, 2019
Staging automation moved this from Needs review to Ready Dec 2, 2019
@matthewbauer matthewbauer merged commit 162a935 into NixOS:staging Dec 2, 2019
Staging automation moved this from Ready to Done Dec 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@peti peti Awaiting requested review from peti

@veprbl veprbl Awaiting requested review from veprbl

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
Staging
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@bhpdt @matthewbauer