diff options
| author | thegeorg <[email protected]> | 2025-03-18 20:15:57 +0300 |
|---|---|---|
| committer | thegeorg <[email protected]> | 2025-03-18 20:34:33 +0300 |
| commit | cdd9bd064de7cc72053d7646b7189cea0e4e8791 (patch) | |
| tree | daa3b87ca6e73c142d11fa5289920196930980d1 | |
| parent | 77ae531e8a94257b245c0188feec4b63008593ce (diff) | |
Emit toolchain version field to COMPILER_VERSION variable
This fixes the following dependency:
```
(dflt) thegeorg@jakku:~/arcadia/util@ymake-compiler-version$ ya dump relation contrib/libs/clang14-rt --recursive --target-platform windows
Directory (Start): $S/util ->
...
File (Include): $S/contrib/libs/clang14-rt/include/sanitizer/common_interface_defs.h
```
commit_hash:abdc87a51f4c23673bfebf4447d8fec9a2607876
22 files changed, 39 insertions, 34 deletions
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index e066567c1a5..062eb634985 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -213,7 +213,7 @@ LINK_SCRIPT_EXE_FLAGS= REAL_LINK_EXE_CMDLINE =\ $YMAKE_PYTHON ${input:"build/scripts/link_exe.py"} \ REAL_LINK_EXE_CMDLINE+=--start-plugins ${ext=.pyplugin:SRCS_GLOBAL} --end-plugins -REAL_LINK_EXE_CMDLINE+=--clang-ver $CLANG_VER +REAL_LINK_EXE_CMDLINE+=--clang-ver $COMPILER_VERSION REAL_LINK_EXE_CMDLINE+=$_LD_LINKER_OUTPUT REAL_LINK_EXE_CMDLINE+=\ $_ROOT_FLAGS \ diff --git a/build/conf/python.conf b/build/conf/python.conf index 7b529f41634..2717a11f9a0 100644 --- a/build/conf/python.conf +++ b/build/conf/python.conf @@ -487,7 +487,7 @@ module PY_ANY_MODULE: DLL_UNIT { # -bundle when ($DARWIN == "yes") { - when ($CLANG_VER == "16" || $CLANG_VER == "18") { + when ($COMPILER_VERSION == "16" || $COMPILER_VERSION == "18") { # TODO(pg): also check 19 and beyond } otherwise { diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make index 0992bf58af3..79536a33b50 100644 --- a/build/platform/lld/ya.make +++ b/build/platform/lld/ya.make @@ -1,6 +1,6 @@ RESOURCES_LIBRARY() -DEFAULT(LLD_VERSION ${CLANG_VER}) +DEFAULT(LLD_VERSION ${COMPILER_VERSION}) TOOLCHAIN(lld) VERSION(${LLD_VERSION}) diff --git a/build/ymake.core.conf b/build/ymake.core.conf index b9c5116bd9d..aad2904e8bd 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -71,14 +71,6 @@ macro _SRC(EXT, SRC, SRCFLAGS...) { # Generic macro definition for _SRC (just a placeholder, it does nothing) } -CLANG_VER=14 -when ($CLANG16 == "yes") { - CLANG_VER=16 -} -when ($CLANG18 == "yes") { - CLANG_VER=18 -} - USE_ARCADIA_COMPILER_RUNTIME=yes when ($LOCAL && $XCODE) { @@ -1091,7 +1083,7 @@ module _LINK_UNIT: _BASE_UNIT { when ($NEED_PROFILE_RUNTIME == "yes") { LDFLAGS+=-resource-dir=contrib/libs/clang-rt - PEERDIR+=contrib/libs/clang${CLANG_VER}-rt/lib/profile + PEERDIR+=contrib/libs/clang${COMPILER_VERSION}-rt/lib/profile } when ($USE_DYNAMIC_CUDA == "yes") { diff --git a/build/ymake_conf.py b/build/ymake_conf.py index dc8a4187ec5..4752ed27fd8 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -587,8 +587,6 @@ class Build(object): if self.pic: emit('PIC', 'yes') - emit('COMPILER_ID', self.tc.type.upper()) - if self.is_valgrind: emit('WITH_VALGRIND', 'yes') @@ -1116,12 +1114,13 @@ class Compiler(object): self.tc = tc def print_compiler(self): - # CLANG and CLANG_VER variables + # CLANG and CLANG{VER} variables emit(self.compiler_variable, 'yes') cv = self.tc.compiler_version if '.' in cv: cv = cv[:cv.index('.')] - emit('{}_VER'.format(self.compiler_variable), cv) + emit('COMPILER_ID', self.tc.type.upper()) + emit('COMPILER_VERSION', cv) if self.tc.is_xcode: emit('XCODE', 'yes') diff --git a/contrib/libs/clang14-rt/lib/asan/ya.make b/contrib/libs/clang14-rt/lib/asan/ya.make index c3cd19e360f..981e911a745 100644 --- a/contrib/libs/clang14-rt/lib/asan/ya.make +++ b/contrib/libs/clang14-rt/lib/asan/ya.make @@ -15,6 +15,8 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( contrib/libs/clang14-rt/lib ) diff --git a/contrib/libs/clang14-rt/lib/asan_cxx/ya.make b/contrib/libs/clang14-rt/lib/asan_cxx/ya.make index 0d46e10dfe8..9dad0117181 100644 --- a/contrib/libs/clang14-rt/lib/asan_cxx/ya.make +++ b/contrib/libs/clang14-rt/lib/asan_cxx/ya.make @@ -15,6 +15,8 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( contrib/libs/clang14-rt/lib ) diff --git a/contrib/libs/clang14-rt/lib/asan_static/ya.make b/contrib/libs/clang14-rt/lib/asan_static/ya.make index 6339dbec829..f721a6a6e30 100644 --- a/contrib/libs/clang14-rt/lib/asan_static/ya.make +++ b/contrib/libs/clang14-rt/lib/asan_static/ya.make @@ -15,6 +15,8 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( contrib/libs/clang14-rt/lib ) diff --git a/contrib/libs/clang14-rt/lib/msan/ya.make b/contrib/libs/clang14-rt/lib/msan/ya.make index 25dfe3000e1..67938fa41c0 100644 --- a/contrib/libs/clang14-rt/lib/msan/ya.make +++ b/contrib/libs/clang14-rt/lib/msan/ya.make @@ -15,6 +15,8 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( contrib/libs/clang14-rt/lib ) diff --git a/contrib/libs/clang14-rt/lib/msan_cxx/ya.make b/contrib/libs/clang14-rt/lib/msan_cxx/ya.make index ef8af1073f2..af50884296f 100644 --- a/contrib/libs/clang14-rt/lib/msan_cxx/ya.make +++ b/contrib/libs/clang14-rt/lib/msan_cxx/ya.make @@ -15,6 +15,8 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( contrib/libs/clang14-rt/lib ) diff --git a/contrib/libs/clang14-rt/lib/tsan/ya.make b/contrib/libs/clang14-rt/lib/tsan/ya.make index f999fab5763..488aa06f7ac 100644 --- a/contrib/libs/clang14-rt/lib/tsan/ya.make +++ b/contrib/libs/clang14-rt/lib/tsan/ya.make @@ -15,6 +15,8 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( contrib/libs/clang14-rt/lib ) diff --git a/contrib/libs/clang14-rt/lib/tsan_cxx/ya.make b/contrib/libs/clang14-rt/lib/tsan_cxx/ya.make index d34ca6e4405..362b60067c3 100644 --- a/contrib/libs/clang14-rt/lib/tsan_cxx/ya.make +++ b/contrib/libs/clang14-rt/lib/tsan_cxx/ya.make @@ -15,6 +15,8 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( contrib/libs/clang14-rt/lib ) diff --git a/library/cpp/sanitizer/address/dynamic/ya.make b/library/cpp/sanitizer/address/dynamic/ya.make index 4d76cb57f56..222be039601 100644 --- a/library/cpp/sanitizer/address/dynamic/ya.make +++ b/library/cpp/sanitizer/address/dynamic/ya.make @@ -7,8 +7,8 @@ NO_UTIL() EXPORT_ALL_DYNAMIC_SYMBOLS() DYNAMIC_LIBRARY_FROM( - contrib/libs/clang${CLANG_VER}-rt/lib/asan - contrib/libs/clang${CLANG_VER}-rt/lib/asan_cxx + contrib/libs/clang${COMPILER_VERSION}-rt/lib/asan + contrib/libs/clang${COMPILER_VERSION}-rt/lib/asan_cxx ) END() diff --git a/library/cpp/sanitizer/address/static/ya.make b/library/cpp/sanitizer/address/static/ya.make index 7210cbced90..901591707db 100644 --- a/library/cpp/sanitizer/address/static/ya.make +++ b/library/cpp/sanitizer/address/static/ya.make @@ -3,9 +3,9 @@ LIBRARY() NO_UTIL() PEERDIR( - contrib/libs/clang${CLANG_VER}-rt/lib/asan - contrib/libs/clang${CLANG_VER}-rt/lib/asan_cxx - contrib/libs/clang${CLANG_VER}-rt/lib/asan_static + contrib/libs/clang${COMPILER_VERSION}-rt/lib/asan + contrib/libs/clang${COMPILER_VERSION}-rt/lib/asan_cxx + contrib/libs/clang${COMPILER_VERSION}-rt/lib/asan_static ) END() diff --git a/library/cpp/sanitizer/include/ya.make b/library/cpp/sanitizer/include/ya.make index 8fb803a8149..5495bd43722 100644 --- a/library/cpp/sanitizer/include/ya.make +++ b/library/cpp/sanitizer/include/ya.make @@ -5,7 +5,7 @@ NO_SANITIZE() NO_RUNTIME() IF (USE_ARCADIA_COMPILER_RUNTIME) - ADDINCL(GLOBAL contrib/libs/clang${CLANG_VER}-rt/include) + ADDINCL(GLOBAL contrib/libs/clang${COMPILER_VERSION}-rt/include) ENDIF() END() diff --git a/library/cpp/sanitizer/leak/dynamic/ya.make b/library/cpp/sanitizer/leak/dynamic/ya.make index f52f739c770..3f3fde9c325 100644 --- a/library/cpp/sanitizer/leak/dynamic/ya.make +++ b/library/cpp/sanitizer/leak/dynamic/ya.make @@ -7,7 +7,7 @@ NO_UTIL() EXPORT_ALL_DYNAMIC_SYMBOLS() DYNAMIC_LIBRARY_FROM( - contrib/libs/clang${CLANG_VER}-rt/lib/lsan + contrib/libs/clang${COMPILER_VERSION}-rt/lib/lsan ) END() diff --git a/library/cpp/sanitizer/leak/static/ya.make b/library/cpp/sanitizer/leak/static/ya.make index 27005709fee..46090e0ba40 100644 --- a/library/cpp/sanitizer/leak/static/ya.make +++ b/library/cpp/sanitizer/leak/static/ya.make @@ -5,7 +5,7 @@ SUBSCRIBER(g:devtools-contrib) NO_UTIL() PEERDIR( - contrib/libs/clang${CLANG_VER}-rt/lib/lsan + contrib/libs/clang${COMPILER_VERSION}-rt/lib/lsan ) END() diff --git a/library/cpp/sanitizer/memory/static/ya.make b/library/cpp/sanitizer/memory/static/ya.make index 0955ec62d8c..ae47cd5ac82 100644 --- a/library/cpp/sanitizer/memory/static/ya.make +++ b/library/cpp/sanitizer/memory/static/ya.make @@ -3,8 +3,8 @@ LIBRARY() NO_UTIL() PEERDIR( - contrib/libs/clang${CLANG_VER}-rt/lib/msan - contrib/libs/clang${CLANG_VER}-rt/lib/msan_cxx + contrib/libs/clang${COMPILER_VERSION}-rt/lib/msan + contrib/libs/clang${COMPILER_VERSION}-rt/lib/msan_cxx ) END() diff --git a/library/cpp/sanitizer/thread/dynamic/ya.make b/library/cpp/sanitizer/thread/dynamic/ya.make index 84d4db4b408..5b9d2a1d82e 100644 --- a/library/cpp/sanitizer/thread/dynamic/ya.make +++ b/library/cpp/sanitizer/thread/dynamic/ya.make @@ -7,8 +7,8 @@ NO_UTIL() EXPORT_ALL_DYNAMIC_SYMBOLS() DYNAMIC_LIBRARY_FROM( - contrib/libs/clang${CLANG_VER}-rt/lib/tsan - contrib/libs/clang${CLANG_VER}-rt/lib/tsan_cxx + contrib/libs/clang${COMPILER_VERSION}-rt/lib/tsan + contrib/libs/clang${COMPILER_VERSION}-rt/lib/tsan_cxx ) END() diff --git a/library/cpp/sanitizer/thread/static/ya.make b/library/cpp/sanitizer/thread/static/ya.make index 7cbd7b9fd5e..bb82a205cb3 100644 --- a/library/cpp/sanitizer/thread/static/ya.make +++ b/library/cpp/sanitizer/thread/static/ya.make @@ -3,8 +3,8 @@ LIBRARY() NO_UTIL() PEERDIR( - contrib/libs/clang${CLANG_VER}-rt/lib/tsan - contrib/libs/clang${CLANG_VER}-rt/lib/tsan_cxx + contrib/libs/clang${COMPILER_VERSION}-rt/lib/tsan + contrib/libs/clang${COMPILER_VERSION}-rt/lib/tsan_cxx ) END() diff --git a/library/cpp/sanitizer/undefined/dynamic/ya.make b/library/cpp/sanitizer/undefined/dynamic/ya.make index 7b3778f85a3..7e426392600 100644 --- a/library/cpp/sanitizer/undefined/dynamic/ya.make +++ b/library/cpp/sanitizer/undefined/dynamic/ya.make @@ -7,8 +7,8 @@ NO_UTIL() EXPORT_ALL_DYNAMIC_SYMBOLS() DYNAMIC_LIBRARY_FROM( - contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone - contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone_cxx + contrib/libs/clang${COMPILER_VERSION}-rt/lib/ubsan_standalone + contrib/libs/clang${COMPILER_VERSION}-rt/lib/ubsan_standalone_cxx ) END() diff --git a/library/cpp/sanitizer/undefined/static/ya.make b/library/cpp/sanitizer/undefined/static/ya.make index 3077d8ee56d..c75802788ef 100644 --- a/library/cpp/sanitizer/undefined/static/ya.make +++ b/library/cpp/sanitizer/undefined/static/ya.make @@ -5,8 +5,8 @@ SUBSCRIBER(g:devtools-contrib) NO_UTIL() PEERDIR( - contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone - contrib/libs/clang${CLANG_VER}-rt/lib/ubsan_standalone_cxx + contrib/libs/clang${COMPILER_VERSION}-rt/lib/ubsan_standalone + contrib/libs/clang${COMPILER_VERSION}-rt/lib/ubsan_standalone_cxx ) END() |
