public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44308 from matthewbauer/fix-cross-ensureUnaffected-test

Browse Source 
Fix androidndk "ensure unaffected test"
This commit is contained in:
Matthew Bauer
2018-08-02 16:54:10 -04:00
committed by GitHub
parent 26d6ff5981 1461b90bed
commit ec34a91706
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/5/llvm.nix
+3 -4
View File
@@ -79,8 +79,8 @@ in stdenv.mkDerivation (rec {
"-DLLVM_ENABLE_RTTI=ON" "-DLLVM_ENABLE_RTTI=ON"
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
] ]
++ stdenv.lib.optional enableSharedLibraries ++ stdenv.lib.optional enableSharedLibraries
"-DLLVM_LINK_LLVM_DYLIB=ON" "-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 ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''; '';
doCheck = stdenv.isLinux && (!stdenv.isi686) doCheck = stdenv.isLinux && (!stdenv.isi686);
&& (stdenv.hostPlatform == stdenv.targetPlatform);
checkTarget = "check-all"; checkTarget = "check-all";
pkgs/development/compilers/llvm/6/llvm.nix
+3 -4
View File
@@ -75,8 +75,8 @@ in stdenv.mkDerivation (rec {
"-DLLVM_ENABLE_RTTI=ON" "-DLLVM_ENABLE_RTTI=ON"
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON" "-DLLVM_ENABLE_DUMP=ON"
] ]
@@ -130,8 +130,7 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''; '';
doCheck = stdenv.isLinux && (!stdenv.isi686) doCheck = stdenv.isLinux && (!stdenv.isi686);
&& (stdenv.hostPlatform == stdenv.targetPlatform);
checkTarget = "check-all"; checkTarget = "check-all";