nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvm: fix triple setting

Browse Source 
llvm is a library so it should just need to know about build & host.
GCC will already have a cross compiler built.

/cc @Ericson2314 @dtzWill
This commit is contained in:
Matthew Bauer 2018-08-01 12:50:22 -04:00
parent 117680b0e9
commit b32d0a41d0
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/llvm/5/llvm.nix
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";

7
pkgs/development/compilers/llvm/6/llvm.nix
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";