diff options
author | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-06-16 23:06:17 +0300 |
---|---|---|
committer | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-06-16 23:06:17 +0300 |
commit | 7f8f327ecc4ac0d9fcfcb9e6dfba03e20a7ff8b7 (patch) | |
tree | 472aacb109ae7c74a1aa32272d66e42b34e36854 /cmake | |
parent | 625dc01ee453c507fdd73e1547df9e1281e1b015 (diff) | |
download | ydb-7f8f327ecc4ac0d9fcfcb9e6dfba03e20a7ff8b7.tar.gz |
External build system generator release 33
Update tools: yexport
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/global_flags.compiler.gnu.cmake | 1 | ||||
-rw-r--r-- | cmake/global_flags.compiler.msvc.cmake | 1 | ||||
-rw-r--r-- | cmake/llvm-tools.cmake | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/cmake/global_flags.compiler.gnu.cmake b/cmake/global_flags.compiler.gnu.cmake index 765ce89a48..3dcde4027f 100644 --- a/cmake/global_flags.compiler.gnu.cmake +++ b/cmake/global_flags.compiler.gnu.cmake @@ -15,7 +15,6 @@ set(_GNU_COMMON_C_CXX_FLAGS "\ -D_THREAD_SAFE \ -D_PTHREADS \ -D_REENTRANT \ - -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES \ -D_LARGEFILE_SOURCE \ -D__STDC_CONSTANT_MACROS \ -D__STDC_FORMAT_MACROS \ diff --git a/cmake/global_flags.compiler.msvc.cmake b/cmake/global_flags.compiler.msvc.cmake index 1f22f3aa5d..ffbd2e033c 100644 --- a/cmake/global_flags.compiler.msvc.cmake +++ b/cmake/global_flags.compiler.msvc.cmake @@ -50,7 +50,6 @@ set (_MSVC_COMMON_C_CXX_FLAGS " \ /D__STDC_CONSTANT_MACROS \ /D__STDC_FORMAT_MACROS \ /D_USING_V110_SDK71_ \ - /D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES \ /DWIN32_LEAN_AND_MEAN \ /DNOMINMAX \ /nologo \ diff --git a/cmake/llvm-tools.cmake b/cmake/llvm-tools.cmake index 970d4e4d35..c3dda8b0d8 100644 --- a/cmake/llvm-tools.cmake +++ b/cmake/llvm-tools.cmake @@ -35,6 +35,13 @@ else() message(STATUS "Using ${LLVMOPT} for LLVM IR optimization") endif() +find_program(LLVMLLC NAMES llc-12 llc) +if (LLVMLLC MATCHES "LLVMLLC-NOTFOUND") + message(SEND_ERROR "llvm llc tool not found") +else() + message(STATUS "Using ${LLVMLLC} for LLVM IR to binary code compilation") +endif() + function(llvm_compile_cxx Tgt Inpt Out Tool UseC) list(APPEND TARGET_INCLUDES "-I$<JOIN:$<TARGET_PROPERTY:${Tgt},INCLUDE_DIRECTORIES>,$<SEMICOLON>-I>") list(APPEND TARGET_COMPILE_OPTIONS "'$<JOIN:$<TARGET_GENEX_EVAL:${Tgt},$<TARGET_PROPERTY:${Tgt},COMPILE_OPTIONS>>,'$<SEMICOLON>'>'") |