aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-09-26 11:59:28 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-09-26 12:10:00 +0300
commit6d72638d465dbbe1f35357c054b99811b3821f53 (patch)
treeb87e078382d2b358674e157fc1a7a591bf22875a
parentc9843510b39357d5510030691beecfab56e3bd17 (diff)
downloadydb-6d72638d465dbbe1f35357c054b99811b3821f53.tar.gz
Drop support for older xcode versions
commit_hash:f714e6d32ed3ecff18519fa5ca123ca92b17a269
-rw-r--r--build/platform/lld/ya.make2
-rw-r--r--build/scripts/link_fat_obj.py7
2 files changed, 1 insertions, 8 deletions
diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make
index 74eaf0d7ec..b3459211f2 100644
--- a/build/platform/lld/ya.make
+++ b/build/platform/lld/ya.make
@@ -48,8 +48,6 @@ ELSEIF (OS_DARWIN OR OS_IOS)
LDFLAGS(
-fuse-ld=${LLD_ROOT_RESOURCE_GLOBAL}/bin/ld64.lld
)
- ELSEIF (XCODE)
- LDFLAGS(-DYA_XCODE)
ELSE()
LDFLAGS(
-fuse-ld=lld
diff --git a/build/scripts/link_fat_obj.py b/build/scripts/link_fat_obj.py
index ea143ec902..aeafea58c4 100644
--- a/build/scripts/link_fat_obj.py
+++ b/build/scripts/link_fat_obj.py
@@ -76,13 +76,8 @@ def main():
linker = groups['linker']
archiver = groups['archiver']
- if 'YA_XCODE' in str(sys.argv):
- no_pie = '-Wl,-no_pie'
- else:
- no_pie = '-Wl,-no-pie'
-
do_link = (
- linker + ['-o', obj_output, '-Wl,-r', '-nodefaultlibs', '-nostartfiles', no_pie] + global_srcs + auto_input
+ linker + ['-o', obj_output, '-Wl,-r', '-nodefaultlibs', '-nostartfiles', '-Wl,-no-pie'] + global_srcs + auto_input
)
do_archive = archiver + [lib_output] + peers
do_globals = None