diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-18 21:42:41 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-18 21:42:41 +0300 |
| commit | 5291e2f6c447d149f3dc17006419bc7411478148 (patch) | |
| tree | 2925d1a7aa1a894f7514fb2181414837e3990799 /build | |
| parent | 68155b41eaf4cc306f8286e7ce8da6f6af7d93f5 (diff) | |
| download | ydb-5291e2f6c447d149f3dc17006419bc7411478148.tar.gz | |
intermediate changes
ref:4ec759a52592995211dfd2877771c14eb231e31b
Diffstat (limited to 'build')
| -rw-r--r-- | build/ya.conf.json | 4 | ||||
| -rw-r--r-- | build/ymake.core.conf | 2 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/build/ya.conf.json b/build/ya.conf.json index 65bd38bc60..4f290896a9 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -7340,8 +7340,8 @@ "renderer": { "formula": { "sandbox_id": [ - 1085349224, - 1088353208 + 1217317559, + 1219860570 ], "match": "" }, diff --git a/build/ymake.core.conf b/build/ymake.core.conf index fdbbedd79e..b90bc11085 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -1677,7 +1677,7 @@ module _BASE_PROGRAM: _LINK_UNIT { CPP_PROGRAM_SEM=add_executable $MODDIR $REALPRJNAME ${hide:TARGET} ${hide:AUTO_INPUT} \ && vcs_info \ - && target_link_flags PUBLIC $OBJADDE_LIB $OBJADDE \ + && target_link_flags PUBLIC $LDFLAGS $LDFLAGS_GLOBAL $OBJADDE_LIB $OBJADDE \ && target_include_directories PRIVATE $_C__INCLUDE_OWNED \ && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS ### @usage: PROGRAM([progname]) diff --git a/build/ymake_conf.py b/build/ymake_conf.py index e65bf273b8..5e52da458b 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -1765,7 +1765,7 @@ class Linker(object): self.type = self._get_default_linker_type() def _get_default_linker_type(self): - if not self.tc.is_from_arcadia: + if not self.tc.is_from_arcadia or is_positive('EXPORT_CMAKE'): # External (e.g. system) toolchain: disable linker selection logic return None |