From 8c67b5c9f52869a2ef31a9c091a4a9c437cccf5f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Sep 2023 22:44:48 +0200 Subject: [PATCH] Strip -fcf-protection for wasm build - new flag added in dpkg 1.22 --- debian/changelog | 6 ++++++ debian/rules | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64ca808f..8de618cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium + + * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22 + + -- Sylvestre Ledru Wed, 06 Sep 2023 22:44:15 +0200 + llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] diff --git a/debian/rules b/debian/rules index b4d75d7a..2626895e 100755 --- a/debian/rules +++ b/debian/rules @@ -811,15 +811,15 @@ ifndef LLVM_SPIRV endif touch $@ +# Remove some new flags introduced by dpkg 1.22.0; +STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g") +STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g") + build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%) build-wasm/compiler-rt-%: @echo "Building compiler-rt for $(cpu)" @echo "Using cmake: $(CMAKE_BIN)" mkdir -p "$@" -# remove unsupported flags - STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed -e 's/-fcf-protection//g'` - STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed -e 's/-fcf-protection//g'` - $(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \ -G Ninja \ $(SCCACHE_CMAKE) \ @@ -829,8 +829,8 @@ build-wasm/compiler-rt-%: -DCMAKE_ASM_COMPILER_TARGET=$(cpu)-unknown-unknown \ -DCMAKE_C_COMPILER=$(STAGE_2_BIN_DIR)/clang \ -DCMAKE_CXX_COMPILER=$(STAGE_2_BIN_DIR)/clang++ \ - -DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_CXXFLAGS)" \ + -DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_WASM_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_WASM_CXXFLAGS)" \ -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)" \