diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-17 01:04:30 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 21:48:58 -0400 |
| commit | a4cfd500044617059d0cfbe804c6814151f7c7e4 (patch) | |
| tree | 6d2a6bba50f81e8d30c21677deaee522b351f2c2 /pkgs/development/compilers/llvm | |
| parent | 721832f97ec96a4fd34549eada8c58314a457f9c (diff) | |
| download | nixlib-a4cfd500044617059d0cfbe804c6814151f7c7e4.tar nixlib-a4cfd500044617059d0cfbe804c6814151f7c7e4.tar.gz nixlib-a4cfd500044617059d0cfbe804c6814151f7c7e4.tar.bz2 nixlib-a4cfd500044617059d0cfbe804c6814151f7c7e4.tar.lz nixlib-a4cfd500044617059d0cfbe804c6814151f7c7e4.tar.xz nixlib-a4cfd500044617059d0cfbe804c6814151f7c7e4.tar.zst nixlib-a4cfd500044617059d0cfbe804c6814151f7c7e4.zip | |
libcxxabi: apply libcxxabi-wasm patch
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/8/libc++abi.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 8a5e1d32c42c..bb5b368267f2 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ - "-DUNIX=ON" "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" ] ++ stdenv.lib.optionals (!enableShared) [ @@ -30,6 +29,8 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch new file mode 100644 index 000000000000..4ebfe46aa813 --- /dev/null +++ b/pkgs/development/compilers/llvm/8/libcxxabi-wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + |