diff options
| author | Will Dietz <w@wdtz.org> | 2018-06-23 16:53:38 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-06-23 16:53:38 -0500 |
| commit | c5e90a929295ed937e1b2d60e26bd002ca84e2a0 (patch) | |
| tree | f6d9d9ce268a85cfad07c1009663c131c86dd1f4 /pkgs/development/compilers | |
| parent | 1667a3c2fa13631f072ed6c263736a20054c1995 (diff) | |
| download | nixlib-c5e90a929295ed937e1b2d60e26bd002ca84e2a0.tar nixlib-c5e90a929295ed937e1b2d60e26bd002ca84e2a0.tar.gz nixlib-c5e90a929295ed937e1b2d60e26bd002ca84e2a0.tar.bz2 nixlib-c5e90a929295ed937e1b2d60e26bd002ca84e2a0.tar.lz nixlib-c5e90a929295ed937e1b2d60e26bd002ca84e2a0.tar.xz nixlib-c5e90a929295ed937e1b2d60e26bd002ca84e2a0.tar.zst nixlib-c5e90a929295ed937e1b2d60e26bd002ca84e2a0.zip | |
llvm_{38,39}: unconditionally set triples, not just w/musl
Follow-on to same changes made to other versions: See #42454, #42456.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/llvm.nix | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index b847a67e7e3f..835a5008ef58 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -78,6 +78,10 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 708e471bd4ac..458ad7db8efd 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -122,6 +122,10 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) @@ -133,9 +137,6 @@ in stdenv.mkDerivation rec { "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" # Not yet supported "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" |