Skip to content

Commit d2f71da

Browse files
committed
[SYCL][Native CPU] More --shared-libs fixes.
* SYCLNativeCPUUtils/CMakeLists.txt: remove EXCLUDE_FROM_ALL. The rationale for setting EXCLUDE_FROM_ALL was to ensure that users do not get the veczc binary unnecessarily but that is already handled differently now that we no longer fetch external sources, and EXCLUDE_FROM_ALL had the side effect of preventing component libraries from being installed. * vecz/tools/CMakeLists.txt: change veczc from tool to utility. The difference is that tools get installed, utilities by default don't, and this is not something that is meant to be installed. * lib/CMakeLists.txt: change include order. SYCLNativeCPUUtils needs to be included after TargetParser so that veczc correctly links to it. Fixes #20077
1 parent 5c5e364 commit d2f71da

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

llvm/lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ add_subdirectory(LineEditor)
4141
add_subdirectory(ProfileData)
4242
add_subdirectory(Passes)
4343
add_subdirectory(SYCLLowerIR)
44-
add_subdirectory(SYCLNativeCPUUtils)
4544
add_subdirectory(SYCLPostLink)
4645
add_subdirectory(TargetParser)
46+
add_subdirectory(SYCLNativeCPUUtils)
4747
add_subdirectory(TextAPI)
4848
add_subdirectory(Telemetry)
4949
add_subdirectory(ToolDrivers)

llvm/lib/SYCLNativeCPUUtils/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(NOT "native_cpu" IN_LIST SYCL_ENABLE_BACKENDS)
77
endif()
88

99
if(NATIVECPU_USE_OCK)
10-
add_subdirectory(compiler_passes EXCLUDE_FROM_ALL)
10+
add_subdirectory(compiler_passes)
1111
set(OCK_LIBS NativeCPUPipeline NativeCPUVecz)
1212
endif()
1313

llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/tools/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
llvm_map_components_to_libnames(llvm_libs all ${LLVM_TARGETS_TO_BUILD})
22
list(REMOVE_ITEM llvm_libs LTO OptRemarks)
33

4-
add_llvm_tool(veczc
4+
add_llvm_utility(veczc
55
${CMAKE_CURRENT_SOURCE_DIR}/source/veczc.cpp
66
)
77
target_compile_options(veczc PRIVATE ${VECZ_COMPILE_OPTIONS})

0 commit comments

Comments
 (0)