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: make -nostdinc work as intended #91974

Merged
merged 1 commit into from Jul 28, 2020
Merged

stdenv: make -nostdinc work as intended #91974

merged 1 commit into from Jul 28, 2020

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Jul 1, 2020 •
edited

Right now we add glibc to search path also -nostdinc was provided,
which breaks projects providing their own gcc.

Motivation for this change
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.

@Mic92 Mic92 requested a review from Ericson2314 as a code owner July 1, 2020 20:57
@Mic92 Mic92 requested a review from matthewbauer July 1, 2020 20:59
@teto teto mentioned this pull request Jul 1, 2020
Closed
9 tasks
@Mic92 Mic92 marked this pull request as draft July 1, 2020 22:06
@Mic92 Mic92 force-pushed the nostdinc branch 3 times, most recently from b78a55d to d4f4506 Compare July 2, 2020 09:14
@Mic92 Mic92 marked this pull request as ready for review July 2, 2020 09:41
@Mic92
Copy link
Member Author

Mic92 commented Jul 2, 2020

Until this hits master, the following solution also works:

with import <nixpkgs> {};
let
  libcPattern =
    builtins.replaceStrings ["/"] ["\\/"] "${gcc.libc_dev}/include";
  gcc' = wrapCCWith {
    cc = gcc.cc;
    bintools = binutils;
    extraBuildCommands = ''
      cat >> $out/nix-support/add-flags.sh <<'EOF'
      if [[ "$@" = *-nostdinc* ]]; then
          NIX_CFLAGS_COMPILE_${gcc.suffixSalt}=''${NIX_CFLAGS_COMPILE_${gcc.suffixSalt}//-idirafter ${libcPattern}/}
      fi
      EOF
    '';
  };
in (overrideCC stdenv gcc').mkDerivation {
  name = "env";
  buildInputs = [
    bashInteractive
  ];
}

@Mic92
Copy link
Member Author

Mic92 commented Jul 2, 2020

@GrahamcOfBorg build stdenv

@FRidh FRidh added this to WIP in Staging via automation Jul 2, 2020
@FRidh FRidh moved this from WIP to Needs review in Staging Jul 2, 2020
@teto teto mentioned this pull request Jul 22, 2020
Open
@Ericson2314
Copy link
Member

Oh this looks great to me; I had tried something similar at one point when adding those new files.

Do note when you fix conflicts that we now touch all the flags files so downstream can unconditionally cat them.

@Ericson2314
Copy link
Member

CC @aaronjanse just in case anything special needs to be done for relibc's crt0.

@aaronjanse
Copy link
Member

CC @aaronjanse just in case anything special needs to be done for relibc's crt0.

I don't know enough to understand this PR well, but I've locally verified that these changes don't break relibc 👍

@Mic92
stdenv: make -nostdinc work as intended
96092dc 
Right now we add glibc to search path also -nostdinc was provided,
which breaks projects providing their own gcc.
Staging automation moved this from Needs review to Ready Jul 28, 2020
@Ericson2314
Copy link
Member

Oh i missed the conflicts were fixed. Let's ship!

@Ericson2314 Ericson2314 merged commit cd719c1 into NixOS:staging Jul 28, 2020
Staging automation moved this from Ready to Done Jul 28, 2020
@Mic92 Mic92 deleted the nostdinc branch July 29, 2020 06:58
@veprbl veprbl mentioned this pull request Sep 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 left review comments

@matthewbauer matthewbauer matthewbauer approved these changes

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
4 participants
@Mic92 @Ericson2314 @aaronjanse @matthewbauer