diff options
| author | Will Dietz <github@wdtz.org> | 2018-06-27 10:02:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-27 10:02:58 -0500 |
| commit | 8575fd554c0334f1a165b1999899400a1405b806 (patch) | |
| tree | cf91f979529a58a819e717a0d1b4435eced86a6d /pkgs | |
| parent | 63433025ae211c240eaeca2b9899414900058875 (diff) | |
| parent | 0ac09be2959c7c9c12d799be8d5a19f6132b8464 (diff) | |
| download | nixpkgs-8575fd554c0334f1a165b1999899400a1405b806.tar nixpkgs-8575fd554c0334f1a165b1999899400a1405b806.tar.gz nixpkgs-8575fd554c0334f1a165b1999899400a1405b806.tar.bz2 nixpkgs-8575fd554c0334f1a165b1999899400a1405b806.tar.lz nixpkgs-8575fd554c0334f1a165b1999899400a1405b806.tar.xz nixpkgs-8575fd554c0334f1a165b1999899400a1405b806.tar.zst nixpkgs-8575fd554c0334f1a165b1999899400a1405b806.zip | |
Merge pull request #42456 from dtzWill/fix/llvm4-triples-unconditional
llvm4: unconditionally set triples, not just on musl.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/llvm/4/llvm.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 06bcd74456c..e9140d3fcc6 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -100,6 +100,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" @@ -115,11 +119,6 @@ in stdenv.mkDerivation (rec { ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ]; postBuild = '' |