diff options
| author | mikhnenko <mikhnenko@yandex-team.com> | 2024-05-13 19:05:38 +0300 |
|---|---|---|
| committer | mikhnenko <mikhnenko@yandex-team.com> | 2024-05-13 19:15:54 +0300 |
| commit | 6c78e22d15a1ee71f94637cfafd3e9f502930bef (patch) | |
| tree | e1f32c2a55b6bc6ab4d4d4fda4b036a77c9813e5 /build/ymake_conf.py | |
| parent | ee1f0b2b864ead167a701a030f064ae9e7278d95 (diff) | |
| download | ydb-6c78e22d15a1ee71f94637cfafd3e9f502930bef.tar.gz | |
Use lld-link for target-platform windows once again
da1125f4b9b5aebe87b610dd1e1a61864ba500cf
Diffstat (limited to 'build/ymake_conf.py')
| -rwxr-xr-x | build/ymake_conf.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 76f4706a2b..1e6669eb9e 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -1800,10 +1800,12 @@ class MSVCToolchainOptions(ToolchainOptions): self.under_wine_compiler = self.params.get('wine', False) self.under_wine_tools = not build.host.is_windows + self.under_wine_link = self.under_wine_tools self.under_wine_lib = self.under_wine_tools self.system_msvc = self.params.get('system_msvc', False) self.ide_msvs = self.params.get('ide_msvs', False) self.use_clang = self.params.get('use_clang', False) + self.use_msvc_linker = is_positive('USE_MSVC_LINKER') self.use_arcadia_toolchain = self.params.get('use_arcadia_toolchain', False) self.sdk_version = None @@ -1872,7 +1874,13 @@ class MSVCToolchainOptions(ToolchainOptions): ]) self.masm_compiler = win_path_fix(os.path.join(bindir, tools_name, asm_name)) - self.link = win_path_fix(os.path.join(bindir, tools_name, 'link.exe')) + + if self.use_clang and not self.use_msvc_linker: + self.link = self.host.exe(self.name_marker, "bin", "lld-link") + self.under_wine_link = False + else: + self.link = win_path_fix(os.path.join(bindir, tools_name, 'link.exe')) + self.under_wine_link = self.under_wine_tools if self.use_clang: self.lib = self.host.exe(self.name_marker, "bin", "llvm-lib") @@ -1921,6 +1929,8 @@ class MSVCToolchain(MSVC, Toolchain): if self.tc.under_wine_tools: emit('_UNDER_WINE_TOOLS', 'yes') + if self.tc.under_wine_link: + emit('_UNDER_WINE_LINK', 'yes') if self.tc.under_wine_lib: emit('_UNDER_WINE_LIB', 'yes') if self.tc.under_wine_compiler: |