diff options
author | Austin Seipp <aseipp@pobox.com> | 2019-05-07 17:20:58 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2019-05-07 17:21:31 -0500 |
commit | 64f7cb24d5f9a3c6132e018befc2caec7400d114 (patch) | |
tree | 718c6a44b038834666d12e9b0e6a326a8e515baf /pkgs | |
parent | 98ec10ecbd4a446147fc2bdd88701bb5b0240236 (diff) | |
download | nixlib-64f7cb24d5f9a3c6132e018befc2caec7400d114.tar nixlib-64f7cb24d5f9a3c6132e018befc2caec7400d114.tar.gz nixlib-64f7cb24d5f9a3c6132e018befc2caec7400d114.tar.bz2 nixlib-64f7cb24d5f9a3c6132e018befc2caec7400d114.tar.lz nixlib-64f7cb24d5f9a3c6132e018befc2caec7400d114.tar.xz nixlib-64f7cb24d5f9a3c6132e018befc2caec7400d114.tar.zst nixlib-64f7cb24d5f9a3c6132e018befc2caec7400d114.zip |
all-packages/test: add gcc9Stdenv, cc-wrapper-gcc9
Follow up from #60860. Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/test/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 9b434da7a84a..793229f8bbb0 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -7,6 +7,7 @@ with pkgs; cc-wrapper-gcc = callPackage ./cc-wrapper { stdenv = gccStdenv; }; cc-wrapper-gcc7 = callPackage ./cc-wrapper { stdenv = gcc7Stdenv; }; cc-wrapper-gcc8 = callPackage ./cc-wrapper { stdenv = gcc8Stdenv; }; + cc-wrapper-gcc9 = callPackage ./cc-wrapper { stdenv = gcc9Stdenv; }; cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; }; cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; cc-wrapper-clang-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.stdenv; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 140844bdb79e..d78e83fbd9cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7088,6 +7088,7 @@ in gcc7Stdenv = overrideCC gccStdenv gcc7; gcc8Stdenv = overrideCC gccStdenv gcc8; + gcc9Stdenv = overrideCC gccStdenv gcc9; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let |