This commit is contained in:
Sylvestre Ledru 2023-03-22 23:37:20 +01:00
parent 2ccea38de4
commit 9312871180
2 changed files with 10 additions and 3 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-16 (1:16.0.0-1~exp4) UNRELEASED; urgency=medium
* Use 16 for wasm libs instead of 16.0.0
https://github.com/llvm/llvm-project/issues/61550
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 22 Mar 2023 23:36:45 +0100
llvm-toolchain-16 (1:16.0.0-1~exp3) experimental; urgency=medium
* Revert gold linker on riscv64, FTBFS

6
debian/rules vendored
View File

@ -792,7 +792,7 @@ build-wasm/compiler-rt-%:
-DCMAKE_SHARED_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
-DCMAKE_MODULE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
-DCMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL) \
-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION) \
-DCMAKE_INSTALL_DATADIR=lib \
-DCMAKE_INSTALL_INCLUDEDIR=include \
-DLLVM_CMAKE_DIR=$(STAGE_2_BIN_DIR)/../ \
@ -822,9 +822,9 @@ build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-%
# We need a wasm compiler-rt. Depend on the make target that builds it,
# and manually copy it to the stage2 lib dir from there
mkdir -p \
$(STAGE_2_LIB_DIR)/clang/$(LLVM_VERSION_FULL)/lib/wasi/
$(STAGE_2_LIB_DIR)/clang/$(LLVM_VERSION)/lib/wasi/
cp build-wasm/compiler-rt-$(cpu)/lib/wasi/libclang_rt.builtins-$(cpu).a \
$(STAGE_2_LIB_DIR)/clang/$(LLVM_VERSION_FULL)/lib/wasi/
$(STAGE_2_LIB_DIR)/clang/$(LLVM_VERSION)/lib/wasi/
# Notes:
# - Uses $(LDFLAGS) instead of $(STAGE_2_LDFLAGS), because wasm-ld does not