https://github.com/frasercrmck created
https://github.com/llvm/llvm-project/pull/148815
This simply makes things better self-contained.
>From a426ba39c895ac8eed7ee0bc69310d7ccb681560 Mon Sep 17 00:00:00 2001
From: Fraser Cormack <fra...@codeplay.com>
Date: Tue, 15 Jul 2025 10:44:48 +0100
Subject: [PATCH] [libclc] Move CMake for prepare_builtins to a subdirectory
---
libclc/CMakeLists.txt | 24 ++----------------------
libclc/utils/CMakeLists.txt | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 22 deletions(-)
create mode 100644 libclc/utils/CMakeLists.txt
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
index e2871d1b01a16..250cc42d04c34 100644
--- a/libclc/CMakeLists.txt
+++ b/libclc/CMakeLists.txt
@@ -164,34 +164,14 @@ endif()
list( SORT LIBCLC_TARGETS_TO_BUILD )
-# Construct LLVM version define
-set( LLVM_VERSION_DEFINE
"-DHAVE_LLVM=0x${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}" )
-
# This needs to be set before any target that needs it
# We need to use LLVM_INCLUDE_DIRS here, because if we are linking to an
# llvm build directory, this includes $src/llvm/include which is where all the
# headers are not $build/include/ which is what LLVM_INCLUDE_DIR is set to.
include_directories( ${LLVM_INCLUDE_DIRS} )
-# Setup prepare_builtins tools
-set(LLVM_LINK_COMPONENTS
- BitReader
- BitWriter
- Core
- IRReader
- Support
-)
-if( LIBCLC_STANDALONE_BUILD )
- add_llvm_executable( prepare_builtins utils/prepare-builtins.cpp )
- set( prepare_builtins_exe prepare_builtins )
- set( prepare_builtins_target prepare_builtins )
-else()
- add_llvm_utility( prepare_builtins utils/prepare-builtins.cpp )
- setup_host_tool( prepare_builtins PREPARE_BUILTINS prepare_builtins_exe
prepare_builtins_target )
-endif()
-target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} )
-# These were not properly reported in early LLVM and we don't need them
-target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions )
+# Configure prepare_builtins
+add_subdirectory(utils)
# Setup arch devices
set( r600--_devices cedar cypress barts cayman )
diff --git a/libclc/utils/CMakeLists.txt b/libclc/utils/CMakeLists.txt
new file mode 100644
index 0000000000000..1d89b3a48e09a
--- /dev/null
+++ b/libclc/utils/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Construct LLVM version define
+set( LLVM_VERSION_DEFINE
"-DHAVE_LLVM=0x${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}" )
+
+# Setup prepare_builtins tools
+set(LLVM_LINK_COMPONENTS
+ BitReader
+ BitWriter
+ Core
+ IRReader
+ Support
+)
+
+if( LIBCLC_STANDALONE_BUILD )
+ add_llvm_executable( prepare_builtins prepare-builtins.cpp )
+ set( prepare_builtins_exe prepare_builtins )
+ set( prepare_builtins_target prepare_builtins )
+else()
+ add_llvm_utility( prepare_builtins prepare-builtins.cpp )
+ setup_host_tool( prepare_builtins PREPARE_BUILTINS prepare_builtins_exe
prepare_builtins_target )
+endif()
+
+target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} )
+# These were not properly reported in early LLVM and we don't need them
+target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions )
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
