diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2024-12-13 20:55:08 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2024-12-13 21:48:15 +0300 |
| commit | 45adb506ceac868501980c617df1f1a5cc62bb9a (patch) | |
| tree | 186aa45943a150dc513887d0e18e07eb13690741 | |
| parent | bcbd65b26deb457d7847c2c3dc5a103134dc1179 (diff) | |
| download | ydb-45adb506ceac868501980c617df1f1a5cc62bb9a.tar.gz | |
Use clang version as clang-windows toolchain version
Also:
* identify toolchain version via "version" field.
* remove unused android_ndk_version from ya.conf.json
commit_hash:851d9b635c86fc25472f38d3a4c0a149d95b630a
| -rw-r--r-- | build/ya.conf.json | 12 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 5 |
2 files changed, 7 insertions, 10 deletions
diff --git a/build/ya.conf.json b/build/ya.conf.json index a98b4e68af..270a8d48cc 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -550,7 +550,6 @@ "params": { "c_compiler": "$(CLANG)/bin/clang", "cxx_compiler": "$(CLANG)/bin/clang++", - "gcc_version": "16", "llvm-symbolizer": "$(CLANG)/bin/llvm-symbolizer", "match_root": "CLANG", "objcopy": "$(CLANG)/bin/llvm-objcopy", @@ -558,7 +557,8 @@ "simctl": "$(XCODE_TOOLS_ROOT-sbr:799017771)/Xcode/SystemRoot/PrivateFrameworks/CoreSimulator.framework/Resources/bin/simctl", "strip": "$(CLANG)/bin/llvm-strip", "type": "clang", - "use_bundle": true + "use_bundle": true, + "version": "16" }, "platforms": [ { @@ -1125,7 +1125,7 @@ "type": "msvc", "use_bundle": true, "use_clang": true, - "version": "2019" + "version": "16" }, "platforms": [ { @@ -1227,7 +1227,6 @@ "params": { "c_compiler": "$(CLANG)/bin/clang", "cxx_compiler": "$(CLANG)/bin/clang++", - "gcc_version": "18", "llvm-symbolizer": "$(CLANG)/bin/llvm-symbolizer", "match_root": "CLANG", "objcopy": "$(CLANG)/bin/llvm-objcopy", @@ -1235,7 +1234,8 @@ "simctl": "$(XCODE_TOOLS_ROOT-sbr:799017771)/Xcode/SystemRoot/PrivateFrameworks/CoreSimulator.framework/Resources/bin/simctl", "strip": "$(CLANG)/bin/llvm-strip", "type": "clang", - "use_bundle": true + "use_bundle": true, + "version": "18" }, "platforms": [ { @@ -1802,7 +1802,7 @@ "type": "msvc", "use_bundle": true, "use_clang": true, - "version": "2019" + "version": "18" }, "platforms": [ { diff --git a/build/ymake_conf.py b/build/ymake_conf.py index ed827b82d5..3ed0ef6335 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -989,8 +989,7 @@ class ToolchainOptions(object): self.c_compiler = self.params['c_compiler'] self.cxx_compiler = self.params['cxx_compiler'] - # TODO(somov): Требовать номер версии всегда. - self.compiler_version = self.params.get('gcc_version') or self.params.get('version') or '0' + self.compiler_version = self.params['version'] self.compiler_version_list = list(map(int, self.compiler_version.split('.'))) # 'match_root' at this point contains real name for references via toolchain @@ -1005,8 +1004,6 @@ class ToolchainOptions(object): self._env = tc_json.get('env', {}) - self.android_ndk_version = self.params.get('android_ndk_version', None) - logger.debug('c_compiler=%s', self.c_compiler) logger.debug('cxx_compiler=%s', self.cxx_compiler) |