Skip to content

Commit ccb99d4

Browse files
authored
Pass through extra flags to libcxx build (WebAssembly#322)
This commit passes through `EXTRA_CFLAGS` to the libcxx build, along with `EXTRA_CXXFLAGS`. This models after the pattern in `wasi-libc` for passing these flags to thread more flags through.
1 parent 935fe1a commit ccb99d4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-libc.BUI
187187
mkdir -p build/libcxx
188188
cd build/libcxx && cmake -G Ninja $(LIBCXX_CMAKE_FLAGS:@PTHREAD@=OFF) \
189189
-DCMAKE_SYSROOT=$(BUILD_PREFIX)/share/wasi-sysroot \
190-
-DCMAKE_C_FLAGS="$(DEBUG_PREFIX_MAP)" \
191-
-DCMAKE_CXX_FLAGS="$(DEBUG_PREFIX_MAP)" \
190+
-DCMAKE_C_FLAGS="$(DEBUG_PREFIX_MAP) $(EXTRA_CFLAGS)" \
191+
-DCMAKE_CXX_FLAGS="$(DEBUG_PREFIX_MAP) $(EXTRA_CXXFLAGS)" \
192192
-DLIBCXX_LIBDIR_SUFFIX=$(ESCAPE_SLASH)/wasm32-wasi \
193193
-DLIBCXXABI_LIBDIR_SUFFIX=$(ESCAPE_SLASH)/wasm32-wasi \
194194
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
@@ -197,8 +197,8 @@ build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-libc.BUI
197197
mkdir -p build/libcxx-threads
198198
cd build/libcxx-threads && cmake -G Ninja $(LIBCXX_CMAKE_FLAGS:@PTHREAD@=ON) \
199199
-DCMAKE_SYSROOT=$(BUILD_PREFIX)/share/wasi-sysroot \
200-
-DCMAKE_C_FLAGS="$(DEBUG_PREFIX_MAP) -pthread" \
201-
-DCMAKE_CXX_FLAGS="$(DEBUG_PREFIX_MAP) -pthread" \
200+
-DCMAKE_C_FLAGS="$(DEBUG_PREFIX_MAP) -pthread $(EXTRA_CFLAGS)" \
201+
-DCMAKE_CXX_FLAGS="$(DEBUG_PREFIX_MAP) -pthread $(EXTRA_CXXFLAGS)" \
202202
-DLIBCXX_LIBDIR_SUFFIX=$(ESCAPE_SLASH)/wasm32-wasi-threads \
203203
-DLIBCXXABI_LIBDIR_SUFFIX=$(ESCAPE_SLASH)/wasm32-wasi-threads \
204204
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \

0 commit comments

Comments
 (0)