Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs with a WebAssembly toolchain. stdenv/cross: use static overlay on isWasm isWasm doesn’t make sense dynamically linked.wip/yesman
parent
6088a4793f
commit
9abff4af4f
@ -0,0 +1,12 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4138acf..41b4763 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS)
|
||||
" is also set to ON.")
|
||||
endif()
|
||||
add_definitions(-D_LIBCXXABI_HAS_NO_THREADS)
|
||||
+ add_definitions(-D_LIBCPP_HAS_NO_THREADS)
|
||||
endif()
|
||||
|
||||
if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
|
@ -0,0 +1,28 @@ |
||||
{ stdenv, fetchFromGitHub, lib }: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "wasilibc-20190413"; |
||||
src = fetchFromGitHub { |
||||
owner = "CraneStation"; |
||||
repo = "wasi-sysroot"; |
||||
rev = "079d7bda78bc0ad8f69c1594444b54786545ce57"; |
||||
sha256 = "09s906bc9485wzkgibnpfh0mii7jkldzr1a6g8k7ch0si8rshi5r"; |
||||
}; |
||||
makeFlags = [ |
||||
"WASM_CC=${stdenv.cc.targetPrefix}cc" |
||||
"WASM_NM=${stdenv.cc.targetPrefix}nm" |
||||
"WASM_AR=${stdenv.cc.targetPrefix}ar" |
||||
"INSTALL_DIR=${placeholder "out"}" |
||||
]; |
||||
|
||||
postInstall = '' |
||||
mv $out/lib/*/* $out/lib |
||||
''; |
||||
|
||||
meta = { |
||||
description = "WASI libc implementation for WebAssembly"; |
||||
homepage = "https://wasi.dev"; |
||||
platforms = lib.platforms.wasi; |
||||
maintainers = [ lib.maintainers.matthewbauer ]; |
||||
}; |
||||
} |
Loading…
Reference in new issue