msb_14154
/
wasi-sdk
mirror of https://github.com/WebAssembly/wasi-sdk
1
0
Code Issues Projects Releases Wiki Activity

Use the just-built ar rather than the host ar.

Browse Source
pull/161/head
Dan Gohman 5 years ago
parent bd4e3e7e7c
commit d02217d639
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
Makefile
Unescape View File

@ -95,7 +95,7 @@ build/compiler-rt.BUILT: build/llvm.BUILT
# Create an empty library so that cmake's configure checks which # Create an empty library so that cmake's configure checks which
# run the compiler to see if it produces working binaries succeed. # run the compiler to see if it produces working binaries succeed.
mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi
$(AR) cr $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi/libclang_rt.builtins-wasm32.a $(BUILD_PREFIX)/bin/ar cr $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi/libclang_rt.builtins-wasm32.a
# Do the build, and install it. # Do the build, and install it.
mkdir -p build/compiler-rt mkdir -p build/compiler-rt
cd build/compiler-rt && cmake -G Ninja \ cd build/compiler-rt && cmake -G Ninja \
@ -148,8 +148,8 @@ build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-libc.BUI
# Create an empty library so that cmake's configure checks which # Create an empty library so that cmake's configure checks which
# run the compiler to see if it produces working binaries succeed. # run the compiler to see if it produces working binaries succeed.
mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi
$(AR) cr $(BUILD_PREFIX)/share/wasi-sysroot/lib/wasm32-wasi/libc++.a $(BUILD_PREFIX)/bin/ar cr $(BUILD_PREFIX)/share/wasi-sysroot/lib/wasm32-wasi/libc++.a
$(AR) cr $(BUILD_PREFIX)/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a $(BUILD_PREFIX)/bin/ar cr $(BUILD_PREFIX)/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a
# Do the build. # Do the build.
mkdir -p build/libcxx mkdir -p build/libcxx
cd build/libcxx && cmake -G Ninja $(LIBCXX_CMAKE_FLAGS) \ cd build/libcxx && cmake -G Ninja $(LIBCXX_CMAKE_FLAGS) \
@ -193,7 +193,7 @@ build/libcxxabi.BUILT: build/libcxx.BUILT build/llvm.BUILT
# Create an empty library so that cmake's configure checks which # Create an empty library so that cmake's configure checks which
# run the compiler to see if it produces working binaries succeed. # run the compiler to see if it produces working binaries succeed.
mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi
$(AR) cr $(BUILD_PREFIX)/share/wasi-sysroot/lib/wasm32-wasi/libc++.a $(BUILD_PREFIX)/bin/ar cr $(BUILD_PREFIX)/share/wasi-sysroot/lib/wasm32-wasi/libc++.a
# Do the build. # Do the build.
mkdir -p build/libcxxabi mkdir -p build/libcxxabi
cd build/libcxxabi && cmake -G Ninja $(LIBCXXABI_CMAKE_FLAGS) \ cd build/libcxxabi && cmake -G Ninja $(LIBCXXABI_CMAKE_FLAGS) \

Write Preview
Loading…
Cancel
Save