diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-02 16:54:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 16:54:10 -0400 |
| commit | ec34a917069eabf72a6b2ffe388599015e81eea1 (patch) | |
| tree | a5823665bdfb3e20badb5edb697999cd060bb6da /pkgs/development/compilers | |
| parent | 26d6ff5981412cfa6e3ad0db95cb818484905d24 (diff) | |
| parent | 1461b90bed9cec45445b89040215357fd98c38cc (diff) | |
| download | nixlib-ec34a917069eabf72a6b2ffe388599015e81eea1.tar nixlib-ec34a917069eabf72a6b2ffe388599015e81eea1.tar.gz nixlib-ec34a917069eabf72a6b2ffe388599015e81eea1.tar.bz2 nixlib-ec34a917069eabf72a6b2ffe388599015e81eea1.tar.lz nixlib-ec34a917069eabf72a6b2ffe388599015e81eea1.tar.xz nixlib-ec34a917069eabf72a6b2ffe388599015e81eea1.tar.zst nixlib-ec34a917069eabf72a6b2ffe388599015e81eea1.zip | |
Merge pull request #44308 from matthewbauer/fix-cross-ensureUnaffected-test
Fix androidndk "ensure unaffected test"
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/5/llvm.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/6/llvm.nix | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 129a6e48b719..3abba0ed340f 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -79,8 +79,8 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -129,8 +129,7 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; - doCheck = stdenv.isLinux && (!stdenv.isi686) - && (stdenv.hostPlatform == stdenv.targetPlatform); + doCheck = stdenv.isLinux && (!stdenv.isi686); checkTarget = "check-all"; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index f95e19543a15..787a48416ab7 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -75,8 +75,8 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" ] @@ -130,8 +130,7 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; - doCheck = stdenv.isLinux && (!stdenv.isi686) - && (stdenv.hostPlatform == stdenv.targetPlatform); + doCheck = stdenv.isLinux && (!stdenv.isi686); checkTarget = "check-all"; |