minor cleanup

This commit is contained in:
digant73 2024-10-10 12:33:27 +02:00
commit 70124053c9
2 changed files with 9 additions and 3 deletions

View file

@ -73,12 +73,18 @@ if(WITH_LLVM)
set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".") set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
endif() endif()
endif() endif()
# For Windows x86 (not Windows AArch64) only when BUILD_LLVM is enabled and
# for Linux x86 (not Linux AArch64) even if BUILD_LLVM is disabled (precompiled llvm used)
if(LLVM_USE_INTEL_JITEVENTS OR (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND COMPILER_X86)) if(LLVM_USE_INTEL_JITEVENTS OR (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND COMPILER_X86))
list (APPEND LLVM_ADDITIONAL_LIBS IntelJITEvents) list (APPEND LLVM_ADDITIONAL_LIBS IntelJITEvents)
endif() endif()
if(LLVM_USE_PERF OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
# For Linux even if BUILD_LLVM is disabled (precompiled llvm used)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
list (APPEND LLVM_ADDITIONAL_LIBS PerfJITEvents) list (APPEND LLVM_ADDITIONAL_LIBS PerfJITEvents)
endif() endif()
llvm_map_components_to_libnames(LLVM_LIBS llvm_map_components_to_libnames(LLVM_LIBS
${LLVM_TARGETS_TO_BUILD} ${LLVM_TARGETS_TO_BUILD}
${LLVM_ADDITIONAL_LIBS} ${LLVM_ADDITIONAL_LIBS}

View file

@ -29,9 +29,9 @@
"USE_SYSTEM_CURL": "OFF", "USE_SYSTEM_CURL": "OFF",
"USE_SYSTEM_ZLIB": "OFF", "USE_SYSTEM_ZLIB": "OFF",
"USE_SYSTEM_LIBPNG": "OFF", "USE_SYSTEM_LIBPNG": "OFF",
"LLVM_ENABLE_LIBCXX": "ON",
"BUILD_LLVM": "OFF", "BUILD_LLVM": "OFF",
"STATIC_LINK_LLVM": "ON", "STATIC_LINK_LLVM": "ON"
"LLVM_ENABLE_LIBCXX": "ON"
}, },
"environment": { "environment": {
"CXX": "clang++", "CXX": "clang++",