diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-03-07 07:03:24 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-03-07 07:26:10 +0300 |
| commit | 606beb46152a0cdce482ab59f5bcfe7c2efc7528 (patch) | |
| tree | 2a6205fae5ac17aacd66b806f8ae149b94bff7ed | |
| parent | f4afd69d55c2352430adee23b6b5d7ed93cc3b0d (diff) | |
| download | ydb-606beb46152a0cdce482ab59f5bcfe7c2efc7528.tar.gz | |
fix CompilerDetector for the case of system compiler used for native Windows builds
97e719923a81af1e94a9ba81fca0f1036f7d191d
| -rwxr-xr-x | build/ymake_conf.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 0613a78e79..d56d05267e 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -931,16 +931,16 @@ class CompilerDetector(object): gcc_version = version(gcc_vars) msvc_version = version(msvc_vars) - if clang_version: + if msvc_version: + logger.debug('Detected MSVC version %s', msvc_version) + self.type = 'msvc' + elif clang_version: logger.debug('Detected Clang version %s', clang_version) self.type = 'clang' elif gcc_version: logger.debug('Detected GCC version %s', gcc_version) # TODO(somov): Переименовать в gcc. self.type = 'gnu' - elif msvc_version: - logger.debug('Detected MSVC version %s', msvc_version) - self.type = 'msvc' else: raise ConfigureError('Could not determine custom compiler type: {}'.format(c_compiler)) |