aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpg <pg@yandex-team.com>2023-09-12 21:47:48 +0300
committerpg <pg@yandex-team.com>2023-09-12 22:03:09 +0300
commit187c3ed1b10b82f8dd36c5aee43cc4551dc97e3f (patch)
tree2232fdf9396f71583f4e505df1edb455811599de
parent780cb95adbe3fda525a69fa319bb44e52c5d89ad (diff)
downloadydb-187c3ed1b10b82f8dd36c5aee43cc4551dc97e3f.tar.gz
-rw-r--r--build/platform/lld/ya.make2
-rw-r--r--build/scripts/link_fat_obj.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make
index 1a3bfd74f3..be2469b977 100644
--- a/build/platform/lld/ya.make
+++ b/build/platform/lld/ya.make
@@ -54,6 +54,8 @@ ELSEIF (OS_DARWIN OR OS_IOS)
LDFLAGS(
-fuse-ld=${LLD_ROOT_RESOURCE_GLOBAL}/ld64.lld
)
+ ELSEIF (XCODE)
+ LDFLAGS(-Ya,xcode)
ELSE()
LDFLAGS(
-fuse-ld=lld
diff --git a/build/scripts/link_fat_obj.py b/build/scripts/link_fat_obj.py
index 73aa9a1727..8862a00106 100644
--- a/build/scripts/link_fat_obj.py
+++ b/build/scripts/link_fat_obj.py
@@ -67,7 +67,12 @@ def main():
linker = groups['linker']
archiver = groups['archiver']
- do_link = linker + ['-o', obj_output, '-Wl,-r', '-nodefaultlibs', '-nostartfiles', '-Wl,-no-pie'] + global_srcs + auto_input
+ 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
do_archive = archiver + [lib_output] + peers
do_globals = None
if args.globals_lib: