Skip to content

Commit

Permalink
gcc: add gccStdenv for darwin
Browse files Browse the repository at this point in the history
(cherry picked from commit a5168fe)
  • Loading branch information
LnL7 committed Sep 17, 2017
1 parent 07425e4 commit 3ff962d
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -5359,6 +5359,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
Expand Down Expand Up @@ -19339,6 +19346,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; };
Expand Down

0 comments on commit 3ff962d

Please sign in to comment.