From 6d4ee32c1c2ac3675bbcf6d5e7a74541babb162f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Aug 2022 22:01:30 +0200 Subject: [PATCH] Revert "Remove -DBUILTINS_CMAKE_ARGS & -DRUNTIMES_CMAKE_ARGS from the cmake call. It is done by -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS & -DBOOTSTRAP_BUILTINS_CMAKE_ARGS instead" This reverts commit 607fbd2e61eeadacd03e2f93531ecb23243c6e9f. --- debian/changelog | 3 --- debian/rules | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1411cdf..6d2a5a26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,9 +10,6 @@ llvm-toolchain-15 (1:15.0.0~+rc3-1~exp1) experimental; urgency=medium * New snapshot release * For Debian Stretch for apt.llvm.org, use clang-14 to build itself as gcc 7 isn't available - * Remove -DBUILTINS_CMAKE_ARGS & -DRUNTIMES_CMAKE_ARGS from the cmake - call. It is done by -DBOOTSTRAP_RUNTIMES_CMAKE_ARGS & - -DBOOTSTRAP_BUILTINS_CMAKE_ARGS instead -- Sylvestre Ledru Thu, 25 Aug 2022 13:32:14 +0200 diff --git a/debian/rules b/debian/rules index 09c5eba0..ef883cc0 100755 --- a/debian/rules +++ b/debian/rules @@ -602,6 +602,8 @@ override_dh_auto_configure: preconfigure -DLIBOMP_ENABLE_RTTI=OFF \ -DLIBOMP_OMPT_SUPPORT=OFF \ $(CMAKE_EXTRA) \ + -DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ + -DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ -DCLANG_ENABLE_BOOTSTRAP=ON \ -DCLANG_BOOTSTRAP_TARGETS="$(ENABLED_STAGE2_CMAKE_BUILD_TARGETS)" \ -DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN" \