diff options
| author | thegeorg <thegeorg@yandex-team.ru> | 2022-05-14 14:49:01 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.ru> | 2022-05-14 14:49:01 +0300 |
| commit | 971233c067fb183ddbc0261a7b5e6cb5c1de823b (patch) | |
| tree | b13beae5d16e9e885a8d508312f91fe37f2586b1 | |
| parent | c0235b947d8f43708878e4aa1ed7532ef663bbaf (diff) | |
| download | ydb-971233c067fb183ddbc0261a7b5e6cb5c1de823b.tar.gz | |
Move some of the lld invocation logic to build/platform/lld
ref:b73d67b7c0dead2d8e7cda493896151162b02f55
| -rw-r--r-- | build/conf/linkers/ld.conf | 4 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index 01315f0778..ede939564b 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -17,10 +17,6 @@ elsewhen ($OS_LINUX == "yes") { } elsewhen ($OS_ANDROID == "yes") { _LD_FLAGS_1=-ldl -Wl,--no-as-needed - when ($_DEFAULT_LINKER_ID == "lld" && $_ANDROID_API_LESS_THEN_29 == "yes") { - # https://github.com/android/ndk/issues/1196 - _LD_FLAGS_2=-Wl,--no-rosegment - } } elsewhen ($OS_DARWIN == "yes") { _LD_FLAGS_1=-Wl,-no_deduplicate diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 9c95c70cd3..173eab7ad0 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -1893,9 +1893,6 @@ class LD(Linker): self.ld_flags.extend(('-Wl,-Bstatic', '-latomic', '-Wl,-Bdynamic')) elif target.is_android: self.ld_flags.extend(['-ldl', '-Wl,--no-as-needed']) - if self.type == Linker.LLD and target.android_api < 29: - # https://github.com/android/ndk/issues/1196 - self.ld_flags.append('-Wl,--no-rosegment') elif target.is_macos: self.ld_flags.append('-Wl,-no_deduplicate') if not self.tc.is_clang: |