summary refs log tree commit diff
path: root/pkgs/test
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-06-18 15:30:39 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-06-18 15:30:39 -0400
commitb3d957649f2cf6033f1b4bb9c3fe759d9b7e1527 (patch)
tree35f6e6901ea4e5ea2cded73fff1e12e2730a00ed /pkgs/test
parenta13286fcf04ec02f41f034b76a11dc920606e2b3 (diff)
parent4627f0719dcc73ccd10d421b05af35170324971d (diff)
downloadnixpkgs-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar
nixpkgs-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.gz
nixpkgs-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.bz2
nixpkgs-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.lz
nixpkgs-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.xz
nixpkgs-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.tar.zst
nixpkgs-b3d957649f2cf6033f1b4bb9c3fe759d9b7e1527.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/test')
-rw-r--r--pkgs/test/cc-wrapper/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 6d30157fe84..7bd82b4ab2a 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -3,7 +3,9 @@ with stdenv.lib;
 let
   # Sanitizers are not supported on Darwin.
   # Sanitizer headers aren't available in older libc++ stdenvs due to a bug
-  sanitizersBroken = stdenv.cc.isClang && versionOlder (getVersion stdenv.cc.name) "5.0.0";
+  sanitizersWorking =
+       (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0")
+    || (stdenv.cc.isGNU && stdenv.isLinux);
 in stdenv.mkDerivation {
   name = "cc-wrapper-test";
 
@@ -43,7 +45,7 @@ in stdenv.mkDerivation {
     NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
     ./ldflags-check
 
-    ${optionalString (!sanitizersBroken) ''
+    ${optionalString sanitizersWorking ''
       printf "checking whether sanitizers are fully functional... ">&2
       $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
       ./sanitizers