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

Disable libc++-$(LLVM_VERSION)-dev-wasm32 on old Debian & Ubuntu

Browse Source
This commit is contained in:
Sylvestre Ledru 2023-01-09 23:47:22 +01:00
parent 164a1f0e66
commit 39f4464e90
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ llvm-toolchain-14 (1:14.0.6-11) UNRELEASED; urgency=medium
[ Sylvestre Ledru ] [ Sylvestre Ledru ]
* Update SV to 4.6.2 * Update SV to 4.6.2
* Disable libc++-$(LLVM_VERSION)-dev-wasm32 on old Debian & Ubuntu
[ Gianfranco Costamagna ] [ Gianfranco Costamagna ]
* Fix riscv64 build by adding spirv again (from @paravoid) * Fix riscv64 build by adding spirv again (from @paravoid)

16
debian/rules vendored
View File

@ -373,6 +373,12 @@ else
PROJECTS+=;lldb PROJECTS+=;lldb
endif endif
LIBCXX_WASM_ENABLE=yes
LIBCXX_WASM_DISABLE_DISTRO := bionic buster focal bullseye
ifeq (,$(filter-out $(WASM_DISABLE_DISTRO), $(DISTRO)))
LIBCXX_WASM_ENABLE=no
endif
ifneq (,$(filter $(DISTRO),stretch)) ifneq (,$(filter $(DISTRO),stretch))
# Don't enable lld python for old distros # Don't enable lld python for old distros
STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_PYTHON=OFF STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_PYTHON=OFF
@ -510,6 +516,12 @@ preconfigure:
if test "$(LLVM_SPIRV_INSTALLED)" = "yes"; then \ if test "$(LLVM_SPIRV_INSTALLED)" = "yes"; then \
sed -i -e "s|#spv\ ||g" debian/libclc-$(LLVM_VERSION).install; \ sed -i -e "s|#spv\ ||g" debian/libclc-$(LLVM_VERSION).install; \
fi fi
# disable libc++-X.Y-dev-wasm32.install.in on old distro
if test "$(LIBCXX_WASM_ENABLE)" = "no"; then \
echo "" > debian/libc++-$(LLVM_VERSION)-dev-wasm32.install; \
fi
if test "$(DISTRO)" = "stretch"; then \ if test "$(DISTRO)" = "stretch"; then \
echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \ echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \
fi fi
@ -750,6 +762,9 @@ build-wasm/compiler-rt-%:
build-wasm/libcxx-%-wasi: cpu = $(@:build-wasm/libcxx-%-wasi=%) build-wasm/libcxx-%-wasi: cpu = $(@:build-wasm/libcxx-%-wasi=%)
build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-% build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-%
ifeq (${LIBCXX_WASM_ENABLE},yes)
@echo "Skipping libcxx-*-wasi on this distro $(DISTRO)"
else
@echo "Building libcxx for $(cpu)" @echo "Building libcxx for $(cpu)"
@echo "Using cmake: $(CMAKE_BIN)" @echo "Using cmake: $(CMAKE_BIN)"
@ -825,6 +840,7 @@ build-wasm/libcxx-%-wasi: build-wasm/compiler-rt-%
-DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \ -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
-DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
ninja -C "$@" $(NJOBS) $(VERBOSE) ninja -C "$@" $(NJOBS) $(VERBOSE)
endif
# Build compiler-rt for wasm32 and wasm64. Build libcxx only for wasm32, as # Build compiler-rt for wasm32 and wasm64. Build libcxx only for wasm32, as
# libcxx requires wasi-libc, which only exists for wasm32 right now. # libcxx requires wasi-libc, which only exists for wasm32 right now.