From 48e44490e907d0bf978e7cf5188a5bdfcca44fc9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 2 May 2018 14:19:28 -0500 Subject: [PATCH] add cc-wrapper test variants for gcc7, gcc8, add to release.nix --- pkgs/top-level/all-packages.nix | 3 +++ pkgs/top-level/release.nix | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e994da03909..35af7305184 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6086,6 +6086,7 @@ with pkgs; }; gcc7Stdenv = overrideCC gccStdenv gcc7; + gcc8Stdenv = overrideCC gccStdenv gcc8; wrapCCMulti = cc: if system == "x86_64-linux" then let @@ -21390,6 +21391,8 @@ with pkgs; tests = recurseIntoAttrs { cc-wrapper = callPackage ../test/cc-wrapper { }; 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-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3ea873cdc7f..5233051cad8 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -107,6 +107,10 @@ let jobs.tests.cc-wrapper.x86_64-linux 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-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux