diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-09-14 07:38:41 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-09-14 07:38:41 +0200 |
commit | f2ea252d23ebc9a5336bf6a61e0644921f64e67c (patch) | |
tree | 48baa93e9dd268f250af54fc7faf3148f4577576 /pkgs/development/compilers/llvm/16/libcxxabi | |
parent | dc0d53b05443cd66dd242ddd972bac74a58f60ee (diff) | |
parent | 186767dea40753ffcd7f4f273d9de063b1c88df9 (diff) | |
download | nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.gz nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.bz2 nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.lz nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.xz nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.tar.zst nixlib-f2ea252d23ebc9a5336bf6a61e0644921f64e67c.zip |
Merge #253854: staging-next 2023-09-07
Diffstat (limited to 'pkgs/development/compilers/llvm/16/libcxxabi')
-rw-r--r-- | pkgs/development/compilers/llvm/16/libcxxabi/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/16/libcxxabi/wasm.patch | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 77ba2d2d008a..04bfee14aa18 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d llvm -i ${./wasm.patch} + patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch} ''; prePatch = '' diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/wasm.patch b/pkgs/development/compilers/llvm/16/libcxxabi/wasm.patch deleted file mode 100644 index 4ebfe46aa813..000000000000 --- a/pkgs/development/compilers/llvm/16/libcxxabi/wasm.patch +++ /dev/null @@ -1,16 +0,0 @@ -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) - |