Consolidate the build flags for the wasm builds.

This commit is contained in:
Sylvestre Ledru 2023-10-04 09:46:59 +02:00
parent 2e2adfa89b
commit 4f43718442
2 changed files with 9 additions and 2 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-17 (1:17.0.2-1~exp2) UNRELEASED; urgency=medium
[ Matthias Klose ]
* Consolidate the build flags for the wasm builds.
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 04 Oct 2023 09:46:49 +0200
llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium
* New upstream release * New upstream release

4
debian/rules vendored
View File

@ -821,8 +821,8 @@ endif
touch $@ touch $@
# Remove some new flags introduced by dpkg 1.22.0; # 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" -e "s/-mbranch-protection=standard//g") STAGE_2_WASM_CFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CFLAGS))
STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g" -e "s/-mbranch-protection=standard//g") STAGE_2_WASM_CXXFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CXXFLAGS))
build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%) build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%)
build-wasm/compiler-rt-%: build-wasm/compiler-rt-%: