diff options
| author | Will Dietz <w@wdtz.org> | 2018-06-23 11:51:22 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-06-23 15:53:44 -0500 |
| commit | 68351290ad701dd655311a9fb557266993362d00 (patch) | |
| tree | a3558ce33fddcd72516bfec79491d7ec879f995c /pkgs/development/compilers | |
| parent | 4ef4e0f44b4a4ed7d0cb6082ef24f2ce25d556b8 (diff) | |
| download | nixlib-68351290ad701dd655311a9fb557266993362d00.tar nixlib-68351290ad701dd655311a9fb557266993362d00.tar.gz nixlib-68351290ad701dd655311a9fb557266993362d00.tar.bz2 nixlib-68351290ad701dd655311a9fb557266993362d00.tar.lz nixlib-68351290ad701dd655311a9fb557266993362d00.tar.xz nixlib-68351290ad701dd655311a9fb557266993362d00.tar.zst nixlib-68351290ad701dd655311a9fb557266993362d00.zip | |
llvm_38: musl patches + options
Same as those added to llvm_39 a few commits ago.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.8/llvm.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 30d40a84b4e7..b847a67e7e3f 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -36,8 +36,12 @@ in stdenv.mkDerivation rec { # Fix a segfault in llc # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html - patches = [ ./D17533-1.patch ] ++ - stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch]; + patches = [ ./D17533-1.patch ] + ++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../TLI-musl.patch + ../dynamiclibrary-musl.patch + ]; # hacky fix: New LLVM releases require a newer macOS SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is @@ -81,6 +85,14 @@ 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}" + # Not yet supported + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + ]; postBuild = '' |