diff --git a/debian/changelog b/debian/changelog index bf0f98bd..248eefad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium + + * Also ignore "-mbranch-protection=standard" (used on arm64) + + -- Sylvestre Ledru Fri, 08 Sep 2023 13:49:38 +0200 + llvm-toolchain-17 (1:17.0.0~+rc4-1~exp3) experimental; urgency=medium * Update control file diff --git a/debian/rules b/debian/rules index 00c4d358..9b6e8def 100755 --- a/debian/rules +++ b/debian/rules @@ -815,8 +815,8 @@ 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") +STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g") +STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g") build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%) build-wasm/compiler-rt-%: