From 6c4af9abec1d6fb8008632f5c294d42bd8cb5e89 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 29 Sep 2022 10:20:54 +0200 Subject: [PATCH] Drop GetHostTriple export again This doesn't work by itself due to the config.guess dependency, and I'm not longer sure this is the right approach. The runtimes build should really be getting this from the exported LLVM_HOST_TRIPLE variable. --- 0001-Export-GetHostTriple.cmake.patch | 25 ------------------------- llvm.spec | 3 --- 2 files changed, 28 deletions(-) delete mode 100644 0001-Export-GetHostTriple.cmake.patch diff --git a/0001-Export-GetHostTriple.cmake.patch b/0001-Export-GetHostTriple.cmake.patch deleted file mode 100644 index fe5a37f..0000000 --- a/0001-Export-GetHostTriple.cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1d22ceca60fe0614f34252c4def041b05ca5d925 Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Tue, 27 Sep 2022 12:55:35 +0200 -Subject: [PATCH] Export GetHostTriple.cmake - -This is needed by the runtimes build. ---- - llvm/cmake/modules/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt -index 428d8bff1cc6..0dd39b0db9a3 100644 ---- a/llvm/cmake/modules/CMakeLists.txt -+++ b/llvm/cmake/modules/CMakeLists.txt -@@ -176,7 +176,6 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - PATTERN LLVMConfigExtensions.cmake EXCLUDE - PATTERN LLVMConfigVersion.cmake EXCLUDE - PATTERN LLVM-Config.cmake EXCLUDE -- PATTERN GetHostTriple.cmake EXCLUDE - PATTERN llvm-driver-template.cpp.in) - - if (NOT LLVM_ENABLE_IDE) --- -2.37.3 - diff --git a/llvm.spec b/llvm.spec index 6a9477d..2681d13 100644 --- a/llvm.spec +++ b/llvm.spec @@ -98,9 +98,6 @@ Patch2: 0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch # TODO: Can be dropped for LLVM 16, see https://reviews.llvm.org/D131282. Patch3: 0001-Install-clang-tblgen.patch -# Export GetHostTriple.cmake for use by the runtimes build. -Patch4: 0001-Export-GetHostTriple.cmake.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: clang