Update to current wasi-sysroot.

This updates wasi-sdk to use the latest version of "wasi-sysroot".

This fixes https://github.com/CraneStation/wasmtime/issues/88.
pull/7/head
Dan Gohman 6 years ago
parent 0ee2a7cd6a
commit 4ad2a0f3e0

6
.gitmodules vendored

@ -1,6 +1,6 @@
[submodule "src/llvm-project"]
path = src/llvm-project
url = https://github.com/llvm/llvm-project
[submodule "src/reference-sysroot"]
path = src/reference-sysroot
url = git@github.com:cranestation/reference-sysroot-wasi
[submodule "src/wasi-sysroot"]
path = src/wasi-sysroot
url = git@github.com:CraneStation/wasi-sysroot

@ -39,11 +39,11 @@ build/llvm.BUILT:
llvm-config
touch build/llvm.BUILT
build/reference-sysroot.BUILT: build/llvm.BUILT
make -C $(ROOT_DIR)/src/reference-sysroot \
build/wasi-sysroot.BUILT: build/llvm.BUILT
make -C $(ROOT_DIR)/src/wasi-sysroot \
WASM_CC=$(PREFIX)/bin/clang \
SYSROOT=$(PREFIX)/share/sysroot
touch build/reference-sysroot.BUILT
touch build/wasi-sysroot.BUILT
build/compiler-rt.BUILT: build/llvm.BUILT
mkdir -p build/compiler-rt
@ -66,7 +66,7 @@ build/compiler-rt.BUILT: build/llvm.BUILT
cp -R $(ROOT_DIR)/build/llvm/lib/clang $(PREFIX)/lib/
touch build/compiler-rt.BUILT
build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/reference-sysroot.BUILT
build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-sysroot.BUILT
mkdir -p build/libcxx
cd build/libcxx; cmake -G "Unix Makefiles" \
-DCMAKE_TOOLCHAIN_FILE=$(ROOT_DIR)/wasi-sdk.cmake \
@ -118,7 +118,7 @@ build/libcxxabi.BUILT: build/libcxx.BUILT build/llvm.BUILT
mv $(PREFIX)/share/sysroot/lib/libc++abi.a $(PREFIX)/share/sysroot/lib/wasm32-wasi/
touch build/libcxxabi.BUILT
build: build/llvm.BUILT build/reference-sysroot.BUILT build/compiler-rt.BUILT build/libcxxabi.BUILT build/libcxx.BUILT
build: build/llvm.BUILT build/wasi-sysroot.BUILT build/compiler-rt.BUILT build/libcxxabi.BUILT build/libcxx.BUILT
strip: build/llvm.BUILT
cd $(PREFIX)/bin; strip clang-8 llc lld llvm-ar

@ -8,10 +8,10 @@
This repository contains no compiler or library code itself; it uses
git submodules to pull in the upstream Clang and LLVM tree, as well as the
WASI reference-sysroot tree.
wasi-sysroot tree.
The Sysroot portion of this SDK is the
[WASI reference-sysroot](https://github.com/CraneStation/wasi-sysroot).
[wasi-sysroot](https://github.com/CraneStation/wasi-sysroot).
Upstream Clang and LLVM 8.0 can compile for WASI out of the box, and WebAssembly
support is included in them by default. So, all that's done here is to provide

@ -1 +0,0 @@
Subproject commit d5a609fe63926533e1054e539ba5f2693d51bdf5

@ -0,0 +1 @@
Subproject commit 320054e84f8f2440def3b1c8700cedb8fd697bf8
Loading…
Cancel
Save