diff options
| author | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-08-30 17:48:36 +0300 |
|---|---|---|
| committer | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-08-30 18:30:16 +0300 |
| commit | 15b722615d5789b04575b0b279cf6f391199da68 (patch) | |
| tree | 2c370fdbf738f23cf5ce143ea6942eea8acd321c | |
| parent | f48651482f1610f1b0ce6704c8ec6924f727910f (diff) | |
| download | ydb-15b722615d5789b04575b0b279cf6f391199da68.tar.gz | |
External build system generator release 49
Update tools: yexport
| -rw-r--r-- | build/external_resources/yexport/resources.json | 2 | ||||
| -rw-r--r-- | cmake/llvm-tools.cmake | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/build/external_resources/yexport/resources.json b/build/external_resources/yexport/resources.json index 60a827abd6..bc15a25fa8 100644 --- a/build/external_resources/yexport/resources.json +++ b/build/external_resources/yexport/resources.json @@ -1,7 +1,7 @@ { "by_platform": { "linux": { - "uri": "sbr:4991330576" + "uri": "sbr:5002462011" } } } diff --git a/cmake/llvm-tools.cmake b/cmake/llvm-tools.cmake index 83276f3dde..d743400b96 100644 --- a/cmake/llvm-tools.cmake +++ b/cmake/llvm-tools.cmake @@ -7,6 +7,7 @@ if (REQUIRED_LLVM_TOOLING_VERSION) find_program(LLVMLINK llvm-link-${REQUIRED_LLVM_TOOLING_VERSION} REQUIRED) find_program(LLVMOPT opt-${REQUIRED_LLVM_TOOLING_VERSION} REQUIRED) find_program(LLVMLLC llc-${REQUIRED_LLVM_TOOLING_VERSION} REQUIRED) + find_program(LLVMAS llvm-as ${REQUIRED_LLVM_TOOLING_VERSION} REQUIRED) else() if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CLANGPLUSPLUS ${CMAKE_CXX_COMPILER}) @@ -51,6 +52,12 @@ else() else() message(STATUS "Using ${LLVMLLC} for LLVM IR to binary code compilation") endif() + find_program(LLVMAS NAMES llvm-as-12 llvm-as-14 llvm-as) + if (LLVMAS MATCHES "LLVMAS-NOTFOUND") + message(SEND_ERROR "llvm-as not found") + else() + message(STATUS "Using ${LLVMAS} for LLVM IR -> BC assembling") + endif() endif() function(llvm_compile_cxx Tgt Inpt Out Tool UseC) |