From 6e7e22da70850e18d7949b95b215c011b9afda70 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Jun 2018 10:22:33 -0400 Subject: llvm 5: split out compiler-rt and remove libcxxabi dep We already did them on non-mass-rebuild llvm 6. Also, this allows simplifying the stdenv booting. We were missing the libcxxabi dep in compile-rt in llvm 6, so fixed that too. --- pkgs/test/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/test/cc-wrapper') diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index dd41cd157cae2..6d30157fe8429 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -3,7 +3,7 @@ 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) "6.0.0"; + sanitizersBroken = stdenv.cc.isClang && versionOlder (getVersion stdenv.cc.name) "5.0.0"; in stdenv.mkDerivation { name = "cc-wrapper-test"; -- cgit 1.4.1