proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-09 18:21:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ Matthias Klose ]

Browse Source 
* Consolidate the build flags for the wasm builds.
  * Disable the clc and wasm builds when not building binary indep packages.
  * Limit the parallel links to 2 on riscv64.
This commit is contained in:
Matthias Klose 2023-10-08 08:14:00 +02:00
parent c5efc4b664
commit de4010878c
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,12 +1,18 @@
llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED; urgency=medium
[ Sylvestre Ledru ]
* replace python3-recommonmark by myst-parser * replace python3-recommonmark by myst-parser
to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3 to follow upstream change b7ff03206d668cd5a620a9d4e1b22ea112ed56e3
And disable generation of the doc on old distro And disable generation of the doc on old distro
* Also install readtapi => llvm-readtapi symlink * Also install readtapi => llvm-readtapi symlink
* Ship tblgen-to-irdl as part of mlir-tools * Ship tblgen-to-irdl as part of mlir-tools
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 25 Sep 2023 21:51:52 +0200 [ Matthias Klose ]
* Consolidate the build flags for the wasm builds.
* Disable the clc and wasm builds when not building binary indep packages.
* Limit the parallel links to 2 on riscv64.
-- Matthias Klose <doko@debian.org> Sun, 08 Oct 2023 08:10:51 +0200
llvm-toolchain-snapshot (1:18~++20230910052457+7560356a832f-1~exp1) experimental; urgency=medium llvm-toolchain-snapshot (1:18~++20230910052457+7560356a832f-1~exp1) experimental; urgency=medium

21
debian/rules vendored
View File

@ -195,6 +195,7 @@ endif
# debug symbols OOM in Ubuntu Ubuntu and slows down build process. # debug symbols OOM in Ubuntu Ubuntu and slows down build process.
ifneq (,$(filter $(DEB_HOST_ARCH),riscv64)) ifneq (,$(filter $(DEB_HOST_ARCH),riscv64))
opt_flags = -O2 -DNDEBUG -g0 opt_flags = -O2 -DNDEBUG -g0
STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=2
else else
opt_flags = -O2 -DNDEBUG -g1 opt_flags = -O2 -DNDEBUG -g1
endif endif
@ -829,8 +830,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-%:
@ -968,8 +969,8 @@ sccache-stats:
override_dh_auto_build: \ override_dh_auto_build: \
debian-full-build \ debian-full-build \
debian-libfuzzer-build \ debian-libfuzzer-build \
debian-libclc-build \ $(if $(filter libclc-%, $(shell dh_listpackages)),debian-libclc-build) \
debian-wasm-build \ $(if $(filter %-wasm32 %-wasm64, $(shell dh_listpackages)),debian-wasm-build) \
sccache-stats sccache-stats
override_dh_prep: build_doc override_dh_prep: build_doc
@ -1131,10 +1132,16 @@ endif
# Remove an osx file # Remove an osx file
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libbolt_rt_instr_osx.a rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libbolt_rt_instr_osx.a
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install if test -d libclc/build; then \
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install; \
fi
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install if test -d build-wasm/compiler-rt-wasm32; then \
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install; \
fi
if test -d build-wasm/compiler-rt-wasm64; then \
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install; \
fi
if test -d build-wasm/libcxx-wasm32-wasi; then \ if test -d build-wasm/libcxx-wasm32-wasi; then \
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/libcxx-wasm32-wasi install; \ DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/libcxx-wasm32-wasi install; \
fi fi