aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authoregorbasharin <egorbasharin@yandex-team.ru>2022-02-10 16:51:37 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:51:37 +0300
commitfc96459a2fff1524815d05412458cac81420a8b7 (patch)
treef976df1d5c284fd25f42b898da3334af85107485 /build
parenta8d8e782feef008a200c4f327a31616464a764aa (diff)
downloadydb-fc96459a2fff1524815d05412458cac81420a8b7.tar.gz
Restoring authorship annotation for <egorbasharin@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build')
-rw-r--r--build/scripts/link_lib.py20
-rwxr-xr-xbuild/ymake_conf.py26
2 files changed, 23 insertions, 23 deletions
diff --git a/build/scripts/link_lib.py b/build/scripts/link_lib.py
index 344d50d4eb..3ccc587fff 100644
--- a/build/scripts/link_lib.py
+++ b/build/scripts/link_lib.py
@@ -8,23 +8,23 @@ class Opts(object):
def __init__(self, args):
self.archiver = args[0]
self.arch_type = args[1]
- self.llvm_ar_format = args[2]
- self.build_root = args[3]
- self.plugin = args[4]
- self.output = args[5]
- auto_input = args[6:]
+ self.llvm_ar_format = args[2]
+ self.build_root = args[3]
+ self.plugin = args[4]
+ self.output = args[5]
+ auto_input = args[6:]
- if self.arch_type == 'GNU_AR':
+ if self.arch_type == 'GNU_AR':
self.create_flags = ['rcs']
self.modify_flags = ['-M']
- elif self.arch_type == 'LLVM_AR':
- self.create_flags = ['rcs', '-format=%s' % self.llvm_ar_format]
- self.modify_flags = ['-M']
+ elif self.arch_type == 'LLVM_AR':
+ self.create_flags = ['rcs', '-format=%s' % self.llvm_ar_format]
+ self.modify_flags = ['-M']
elif self.arch_type == 'LIBTOOL':
self.create_flags = ['-static', '-o']
self.modify_flags = []
- need_modify = self.arch_type != 'LIBTOOL' and any(item.endswith('.a') for item in auto_input)
+ need_modify = self.arch_type != 'LIBTOOL' and any(item.endswith('.a') for item in auto_input)
if need_modify:
self.objs = filter(lambda x: x.endswith('.o'), auto_input)
self.libs = filter(lambda x: x.endswith('.a'), auto_input)
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 30219eb85e..4a0f341db5 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -1824,18 +1824,18 @@ class LD(Linker):
else:
self.ar = 'ar'
- self.ar_type = 'GNU_AR'
- self.llvm_ar_format = 'None'
-
- if 'libtool' in self.ar:
- self.ar_type = 'LIBTOOL'
- elif 'llvm-ar' in self.ar:
- self.ar_type = 'LLVM_AR'
- if target.is_apple:
- self.llvm_ar_format="darwin"
- else:
- self.llvm_ar_format="gnu"
-
+ self.ar_type = 'GNU_AR'
+ self.llvm_ar_format = 'None'
+
+ if 'libtool' in self.ar:
+ self.ar_type = 'LIBTOOL'
+ elif 'llvm-ar' in self.ar:
+ self.ar_type = 'LLVM_AR'
+ if target.is_apple:
+ self.llvm_ar_format="darwin"
+ else:
+ self.llvm_ar_format="gnu"
+
self.ld_flags = []
# Save linker's stdout to an additional .txt output file
@@ -1970,7 +1970,7 @@ class LD(Linker):
super(LD, self).print_linker()
emit('AR_TOOL', self.ar)
- emit('AR_TYPE', self.ar_type)
+ emit('AR_TYPE', self.ar_type)
emit('STRIP_TOOL_VENDOR', self.strip)
emit('OBJCOPY_TOOL_VENDOR', self.objcopy)