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

add cc-wrapper test variants for gcc7, gcc8, add to release.nix

This commit is contained in:
Will Dietz 2018-05-02 14:19:28 -05:00 committed by Patrick Hilhorst
parent c7a6b36658
commit 48e44490e9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6086,6 +6086,7 @@ with pkgs;
}; };
gcc7Stdenv = overrideCC gccStdenv gcc7; gcc7Stdenv = overrideCC gccStdenv gcc7;
gcc8Stdenv = overrideCC gccStdenv gcc8;
wrapCCMulti = cc: wrapCCMulti = cc:
if system == "x86_64-linux" then let if system == "x86_64-linux" then let
@ -21390,6 +21391,8 @@ with pkgs;
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-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; };
cc-wrapper-gcc7 = callPackage ../test/cc-wrapper { stdenv = gcc7Stdenv; };
cc-wrapper-gcc8 = callPackage ../test/cc-wrapper { stdenv = gcc8Stdenv; };
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; };

4
pkgs/top-level/release.nix
View File

@ -107,6 +107,10 @@ let
jobs.tests.cc-wrapper.x86_64-linux jobs.tests.cc-wrapper.x86_64-linux
jobs.tests.cc-wrapper.x86_64-darwin jobs.tests.cc-wrapper.x86_64-darwin
jobs.tests.cc-wrapper-gcc7.x86_64-linux
jobs.tests.cc-wrapper-gcc7.x86_64-darwin
jobs.tests.cc-wrapper-gcc8.x86_64-linux
jobs.tests.cc-wrapper-gcc8.x86_64-darwin
jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-clang.x86_64-linux
jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-darwin
jobs.tests.cc-wrapper-libcxx.x86_64-linux jobs.tests.cc-wrapper-libcxx.x86_64-linux