proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 13:27:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip -fcf-protection for wasm build - new flag added in dpkg 1.22

Browse Source
This commit is contained in:
Sylvestre Ledru 2023-09-06 22:44:48 +02:00
parent 50df25a859
commit 8c67b5c9f5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> Wed, 06 Sep 2023 22:44:15 +0200
llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium
[ John Paul Adrian Glaubitz ] [ John Paul Adrian Glaubitz ]

12
debian/rules vendored
View File

@ -811,15 +811,15 @@ ifndef LLVM_SPIRV
endif endif
touch $@ 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-%: cpu = $(@:build-wasm/compiler-rt-%=%)
build-wasm/compiler-rt-%: build-wasm/compiler-rt-%:
@echo "Building compiler-rt for $(cpu)" @echo "Building compiler-rt for $(cpu)"
@echo "Using cmake: $(CMAKE_BIN)" @echo "Using cmake: $(CMAKE_BIN)"
mkdir -p "$@" 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/ \ $(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \
-G Ninja \ -G Ninja \
$(SCCACHE_CMAKE) \ $(SCCACHE_CMAKE) \
@ -829,8 +829,8 @@ build-wasm/compiler-rt-%:
-DCMAKE_ASM_COMPILER_TARGET=$(cpu)-unknown-unknown \ -DCMAKE_ASM_COMPILER_TARGET=$(cpu)-unknown-unknown \
-DCMAKE_C_COMPILER=$(STAGE_2_BIN_DIR)/clang \ -DCMAKE_C_COMPILER=$(STAGE_2_BIN_DIR)/clang \
-DCMAKE_CXX_COMPILER=$(STAGE_2_BIN_DIR)/clang++ \ -DCMAKE_CXX_COMPILER=$(STAGE_2_BIN_DIR)/clang++ \
-DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_CFLAGS)" \ -DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_WASM_CFLAGS)" \
-DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_CXXFLAGS)" \ -DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_WASM_CXXFLAGS)" \
-DCMAKE_SHARED_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -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_MODULE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \
-DCMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -DCMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \