From 4f4371844202df730d9c500a5f4251125cab2c99 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Oct 2023 09:46:59 +0200 Subject: [PATCH] Consolidate the build flags for the wasm builds. --- debian/changelog | 7 +++++++ debian/rules | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a74d2ac..1fb0c981 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 04 Oct 2023 09:46:49 +0200 + llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium * New upstream release diff --git a/debian/rules b/debian/rules index 891b6620..c536c257 100755 --- a/debian/rules +++ b/debian/rules @@ -821,8 +821,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" -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") +STAGE_2_WASM_CFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CFLAGS)) +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-%: