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

Use -DCMAKE_C_COMPILER_WORKS=ON instead of stubbing out archive files.

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

16
Makefile
Unescape View File

@ -92,13 +92,10 @@ build/wasi-libc.BUILT: build/llvm.BUILT
touch build/wasi-libc.BUILT touch build/wasi-libc.BUILT
build/compiler-rt.BUILT: build/llvm.BUILT build/compiler-rt.BUILT: build/llvm.BUILT
# Create an empty library so that cmake's configure checks which
# run the compiler to see if it produces working binaries succeed.
mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi
$(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 \
-DCMAKE_C_COMPILER_WORKS=ON \
-DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \ -DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_TOOLCHAIN_FILE=$(ROOT_DIR)/wasi-sdk.cmake \ -DCMAKE_TOOLCHAIN_FILE=$(ROOT_DIR)/wasi-sdk.cmake \
@ -122,6 +119,7 @@ build/compiler-rt.BUILT: build/llvm.BUILT
# Flags for libcxx. # Flags for libcxx.
LIBCXX_CMAKE_FLAGS = \ LIBCXX_CMAKE_FLAGS = \
-DCMAKE_C_COMPILER_WORKS=ON \
-DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \ -DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \
-DCMAKE_TOOLCHAIN_FILE=$(ROOT_DIR)/wasi-sdk.cmake \ -DCMAKE_TOOLCHAIN_FILE=$(ROOT_DIR)/wasi-sdk.cmake \
-DCMAKE_STAGING_PREFIX=$(PREFIX)/share/wasi-sysroot \ -DCMAKE_STAGING_PREFIX=$(PREFIX)/share/wasi-sysroot \
@ -145,11 +143,6 @@ LIBCXX_CMAKE_FLAGS = \
--debug-trycompile --debug-trycompile
build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-libc.BUILT build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-libc.BUILT
# Create an empty library so that cmake's configure checks which
# run the compiler to see if it produces working binaries succeed.
mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi
$(BUILD_PREFIX)/bin/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++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) \
@ -164,6 +157,7 @@ build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-libc.BUI
# Flags for libcxxabi. # Flags for libcxxabi.
LIBCXXABI_CMAKE_FLAGS = \ LIBCXXABI_CMAKE_FLAGS = \
-DCMAKE_C_COMPILER_WORKS=ON \
-DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \ -DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_CXX_COMPILER_WORKS=ON \ -DCMAKE_CXX_COMPILER_WORKS=ON \
@ -190,10 +184,6 @@ LIBCXXABI_CMAKE_FLAGS = \
--debug-trycompile --debug-trycompile
build/libcxxabi.BUILT: build/libcxx.BUILT build/llvm.BUILT build/libcxxabi.BUILT: build/libcxx.BUILT build/llvm.BUILT
# Create an empty library so that cmake's configure checks which
# run the compiler to see if it produces working binaries succeed.
mkdir -p $(BUILD_PREFIX)/lib/clang/$(CLANG_VERSION)/lib/wasi
$(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