diff options
| author | Aristid Breitkreuz <aristidb@gmail.com> | 2017-09-10 15:43:46 +0200 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2017-09-10 15:43:59 +0200 |
| commit | 3dea1972737f5ce7b2c5461fe20370bad10aae03 (patch) | |
| tree | 7ed039c9a38d9584a381b73faeb87a26090554cd /pkgs/development/compilers | |
| parent | 6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177 (diff) | |
| download | nixpkgs-3dea1972737f5ce7b2c5461fe20370bad10aae03.tar nixpkgs-3dea1972737f5ce7b2c5461fe20370bad10aae03.tar.gz nixpkgs-3dea1972737f5ce7b2c5461fe20370bad10aae03.tar.bz2 nixpkgs-3dea1972737f5ce7b2c5461fe20370bad10aae03.tar.lz nixpkgs-3dea1972737f5ce7b2c5461fe20370bad10aae03.tar.xz nixpkgs-3dea1972737f5ce7b2c5461fe20370bad10aae03.tar.zst nixpkgs-3dea1972737f5ce7b2c5461fe20370bad10aae03.zip | |
ispc: use newer version and LLVM 4.0 due to bug in clang++ 3.9 wrapper (see #29204)
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ispc/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 6bc7f66ca29..0e4bc420241 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -2,11 +2,9 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: -# TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? - stdenv.mkDerivation rec { - version = "1.9.1"; - rev = "v${version}"; + version = "20170807"; + rev = "6e0fc2f148e95afad998a7c7f4d7908d29fd8e44"; inherit testedTargets; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "1wwsyvn44hd5iyi5779l5378x096307slpyl29wrsmfp66796693"; + sha256 = "17fwnfm8a329lgfhjwcvji4h1fm4iqmc28wz23hvgqbpj8lk6qgh"; }; # there are missing dependencies in the Makefile, causing sporadic build failures @@ -60,8 +58,8 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "CXX=${llvmPackages.clang}/bin/clang++" - "CLANG=${llvmPackages.clang}/bin/clang" + "CXX=${stdenv.cc}/bin/clang++" + "CLANG=${stdenv.cc}/bin/clang" "CLANG_INCLUDE=${llvmPackages.clang-unwrapped}/include" ]; |