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

change cmake generator and all build invocations from make to ninja

Browse Source
This commit is contained in:
Erik Maciejewski 2021-09-27 12:08:24 -07:00
parent 20d2a90c2a
commit e2ff301911
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
debian/rules vendored
View File

@ -327,6 +327,8 @@ ifeq ($(shell test -e /tmp/cmake/bin/cmake && echo -n yes),yes)
export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/ export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/
endif endif
GENERATOR=Ninja
%: %:
dh $@ $(DH_OPTIONS) dh $@ $(DH_OPTIONS)
@ -433,8 +435,11 @@ override_dh_auto_configure: preconfigure
echo "Running tests: $(RUN_TEST)" echo "Running tests: $(RUN_TEST)"
echo "Using cmake: $(CMAKE_BIN)"; \ echo "Using cmake: $(CMAKE_BIN)"; \
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ CFLAGS="$(CFLAGS_EXTRA)" \
$(PRE_PROCESS_CONF) $(CMAKE_BIN) -S llvm/ -B $(TARGET_BUILD) \ CXXFLAGS="$(CXXFLAGS_EXTRA)" \
LDFLAGS="$(LDFLAGS_EXTRA)" \
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH $(PRE_PROCESS_CONF) $(CMAKE_BIN) -S llvm/ -B $(TARGET_BUILD) \
-G $(GENERATOR) \
-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \ -DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \
-DCMAKE_SUPPRESS_REGENERATION=ON \ -DCMAKE_SUPPRESS_REGENERATION=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
@ -532,7 +537,7 @@ endif
debian-full-build: debian-full-build:
# linker hack so stage2 can link against stage1 libs at runtime # linker hack so stage2 can link against stage1 libs at runtime
LD_LIBRARY_PATH=$(STAGE1_LIB_DIR):$$LD_LIBRARY_PATH \ LD_LIBRARY_PATH=$(STAGE1_LIB_DIR):$$LD_LIBRARY_PATH \
$(PRE_PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CFLAGS="$(CFLAGS_EXTRA)" CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 stage2 $(PRE_PROCESS) ninja $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) stage2
# Check the stage 2 build worked # Check the stage 2 build worked
if ! readelf --string-dump .comment $(TARGET_BUILD_STAGE2)/bin/clang 2>&1|grep -q "clang version"; then \ if ! readelf --string-dump .comment $(TARGET_BUILD_STAGE2)/bin/clang 2>&1|grep -q "clang version"; then \
@ -570,6 +575,7 @@ debian-libclc-build:
echo "Using cmake: $$CMAKE_BIN"; \ echo "Using cmake: $$CMAKE_BIN"; \
cd libclc/build && \ cd libclc/build && \
$$CMAKE_BIN ../ \ $$CMAKE_BIN ../ \
-G $(GENERATOR) \
-DCMAKE_C_COMPILER=$(BASE_PATH)/$(TARGET_BUILD_STAGE2)/bin/clang \ -DCMAKE_C_COMPILER=$(BASE_PATH)/$(TARGET_BUILD_STAGE2)/bin/clang \
-DCMAKE_CXX_COMPILER=$(BASE_PATH)/$(TARGET_BUILD_STAGE2)/bin/clang++ \ -DCMAKE_CXX_COMPILER=$(BASE_PATH)/$(TARGET_BUILD_STAGE2)/bin/clang++ \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
@ -577,7 +583,7 @@ debian-libclc-build:
-DCMAKE_INSTALL_INCLUDEDIR=include \ -DCMAKE_INSTALL_INCLUDEDIR=include \
-DLLVM_CONFIG=$(BASE_PATH)/$(TARGET_BUILD_STAGE2)/bin/llvm-config \ -DLLVM_CONFIG=$(BASE_PATH)/$(TARGET_BUILD_STAGE2)/bin/llvm-config \
-DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \ -DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \
make $(NJOBS) $(VERBOSE) ninja $(NJOBS) $(VERBOSE)
touch $@ touch $@
override_dh_auto_build: debian-full-build debian-libfuzzer-build debian-libclc-build override_dh_auto_build: debian-full-build debian-libfuzzer-build debian-libclc-build
@ -638,7 +644,7 @@ override_dh_auto_install:
# Clean up temporary files to make sure the install works # Clean up temporary files to make sure the install works
rm -rf $(find $(TARGET_BUILD) -wholename '*CMakeFiles*' -not -name CMakeLists.txt -a -name "*.dir" -type d) rm -rf $(find $(TARGET_BUILD) -wholename '*CMakeFiles*' -not -name CMakeLists.txt -a -name "*.dir" -type d)
# install/fast enables a make install without recompiling temporary files # install/fast enables a make install without recompiling temporary files
$(MAKE) -C $(TARGET_BUILD) $(VERBOSE) stage2-install DESTDIR=$(DEB_INST)/ DESTDIR=$(DEB_INST)/ ninja -C $(TARGET_BUILD) $(VERBOSE) stage2-install
# Not used on Linux. # Not used on Linux.
rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper
@ -929,7 +935,7 @@ endif
# Polly tests # Polly tests
#ifeq (${POLLY_ENABLE},yes) #ifeq (${POLLY_ENABLE},yes)
# $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-polly || true # ninja -C $(TARGET_BUILD) check-polly || true
#endif #endif
# Managed by debian build system # Managed by debian build system