nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

gcc: add gccStdenv for darwin

Browse Source
This commit is contained in:
Daiderd Jordan 2017-09-17 20:03:34 +02:00
parent 64d8f4f972
commit a5168fe457
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
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 = gcc6;
gcc-unwrapped = gcc.cc; 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: wrapCCMulti = cc:
if system == "x86_64-linux" then lowPrio ( if system == "x86_64-linux" then lowPrio (
let let
@ -19421,6 +19428,7 @@ with pkgs;
# `recurseIntoAttrs` for sake of hydra, not nix-env # `recurseIntoAttrs` for sake of hydra, not nix-env
tests = recurseIntoAttrs { tests = recurseIntoAttrs {
cc-wrapper = callPackage ../test/cc-wrapper { }; 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-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; };
cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; };