Revert "Revert "Replace LLVM_CONFIG by LLVM_CMAKE_DIR""

This reverts commit 3a129e657c.
This commit is contained in:
Sylvestre Ledru 2022-11-25 12:15:50 +01:00
parent e436189caa
commit 051aef8c59
2 changed files with 3 additions and 2 deletions

1
debian/changelog vendored
View File

@ -4,6 +4,7 @@ llvm-toolchain-snapshot (1:16~++20221111053703+a77a02aa5794-1~exp2) experimental
/usr/lib/llvm-16/lib/clang/16.0.0/ to
/usr/lib/llvm-16/lib/clang/16/
* Workaround some missing files on buster
* Replace LLVM_CONFIG by LLVM_CMAKE_DIR
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 19 Nov 2022 10:16:49 +0100

4
debian/rules vendored
View File

@ -748,7 +748,7 @@ debian-libclc-build:
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_DATADIR=lib \
-DCMAKE_INSTALL_INCLUDEDIR=include \
-DLLVM_CONFIG=$(STAGE_2_BIN_DIR)/llvm-config \
-DLLVM_CMAKE_DIR=$(STAGE_2_BIN_DIR) \
$(LIBCLC_LLVM_SPIRV) \
-DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \
ninja -j $(NJOBS) $(VERBOSE)
@ -778,7 +778,7 @@ ifeq (${COMPILER_RT_WASM_ENABLE},yes)
-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL) \
-DCMAKE_INSTALL_DATADIR=lib \
-DCMAKE_INSTALL_INCLUDEDIR=include \
-DLLVM_CONFIG_PATH=$(STAGE_2_BIN_DIR)/llvm-config \
-DLLVM_CMAKE_DIR=$(STAGE_2_BIN_DIR) \
-DCOMPILER_RT_STANDALONE_BUILD=ON \
-DCOMPILER_RT_BAREMETAL_BUILD=ON \
-DCOMPILER_RT_INCLUDE_TESTS=OFF \