JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28889 from LnL7/stdenv-gcc

Browse Source 
gcc: add gccStdenv for darwin
This commit is contained in:
Daiderd Jordan 2017-09-17 20:06:13 +02:00 committed by GitHub
commit 261bac277f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -5378,6 +5378,13 @@ with pkgs;
gcc = gcc6;
gcc-unwrapped = gcc.cc;
gccStdenv = if (!stdenv.isDarwin) then stdenv else stdenv.override {
allowedRequisites = null;
cc = gcc;
# Include unwrapped binaries like AS, etc. and remove libcxx/libcxxabi
extraBuildInputs = [ stdenv.cc.cc ];
};
wrapCCMulti = cc:
if system == "x86_64-linux" then lowPrio (
let
@ -19421,6 +19428,7 @@ with pkgs;
# `recurseIntoAttrs` for sake of hydra, not nix-env
tests = recurseIntoAttrs {
cc-wrapper = callPackage ../test/cc-wrapper { };
cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; };
cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; };
cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; };