diff options
| author | Will Dietz <w@wdtz.org> | 2018-06-23 11:59:12 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-06-23 15:53:44 -0500 |
| commit | dd4299a27c1cfdb8ac8e355c96051f278ec9734a (patch) | |
| tree | c679760ac1240197e5f5bde1fc055eae7da592da | |
| parent | ebcdd8b9b01afa9bbe57d432a00063a008c5f1e6 (diff) | |
| download | nixpkgs-dd4299a27c1cfdb8ac8e355c96051f278ec9734a.tar nixpkgs-dd4299a27c1cfdb8ac8e355c96051f278ec9734a.tar.gz nixpkgs-dd4299a27c1cfdb8ac8e355c96051f278ec9734a.tar.bz2 nixpkgs-dd4299a27c1cfdb8ac8e355c96051f278ec9734a.tar.lz nixpkgs-dd4299a27c1cfdb8ac8e355c96051f278ec9734a.tar.xz nixpkgs-dd4299a27c1cfdb8ac8e355c96051f278ec9734a.tar.zst nixpkgs-dd4299a27c1cfdb8ac8e355c96051f278ec9734a.zip | |
llvm_39: musl patches, same as llvm_4
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/libc++/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.9/libc++abi.nix | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 7e5c30bdfd3..da18e10c68a 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { patches = [ # glibc 2.26 fix ./xlocale-glibc-2.26.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + ] + ++ lib.optional stdenv.isDarwin ./darwin.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ../../libcxx-max_align_t.patch + ]; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -25,7 +30,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index dc508757ab6..dffb207a32b 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin |