Merge remote-tracking branch 'origin/16' into 17

This commit is contained in:
Sylvestre Ledru 2023-09-07 19:48:04 +02:00
commit 9000ed8e3a
2 changed files with 8 additions and 4 deletions

8
debian/changelog vendored
View File

@ -96,12 +96,16 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 28 Jan 2023 18:07:40 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Sat, 28 Jan 2023 18:07:40 +0100
llvm-toolchain-16 (1:16.0.6-13) UNRELEASED; urgency=medium llvm-toolchain-16 (1:16.0.6-13) unstable; urgency=medium
[ Gianfranco Costamagna ]
* Also runtime-depend on {libzstd,zlib1g}-dev, from Paravoid (Closes: * Also runtime-depend on {libzstd,zlib1g}-dev, from Paravoid (Closes:
#1047718) #1047718)
-- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 07 Sep 2023 01:43:23 +0200 [ Sylvestre Ledru ]
* Strip -fcf-protection for wasm build - new flag added in dpkg 1.22
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 07 Sep 2023 13:01:14 +0200
llvm-toolchain-16 (1:16.0.6-12) unstable; urgency=medium llvm-toolchain-16 (1:16.0.6-12) unstable; urgency=medium

4
debian/rules vendored
View File

@ -896,8 +896,8 @@ build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-%
-DCMAKE_CXX_COMPILER=$(STAGE_2_BIN_DIR)/clang++ \ -DCMAKE_CXX_COMPILER=$(STAGE_2_BIN_DIR)/clang++ \
-DCMAKE_AR=$(STAGE_2_BIN_DIR)/llvm-ar \ -DCMAKE_AR=$(STAGE_2_BIN_DIR)/llvm-ar \
-DCMAKE_RANLIB=$(STAGE_2_BIN_DIR)/llvm-ranlib \ -DCMAKE_RANLIB=$(STAGE_2_BIN_DIR)/llvm-ranlib \
-DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_CFLAGS) -fno-stack-protector" \ -DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_WASM_CFLAGS) -fno-stack-protector" \
-DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_CXXFLAGS) -fno-stack-protector" \ -DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_WASM_CXXFLAGS) -fno-stack-protector" \
-DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
-DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS) -L$(STAGE_2_LIB_DIR)" \