aboutsummaryrefslogtreecommitdiffstats
path: root/build/ymake_conf.py
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
commit6eb4c90eddd2fa28550ba7f04d0815659b4270ff (patch)
tree5d5cb817648f650d76cf1076100726fd9b8448e8 /build/ymake_conf.py
parentfc96459a2fff1524815d05412458cac81420a8b7 (diff)
downloadydb-6eb4c90eddd2fa28550ba7f04d0815659b4270ff.tar.gz
Restoring authorship annotation for <egorbasharin@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/ymake_conf.py')
-rwxr-xr-xbuild/ymake_conf.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 4a0f341db5..30219eb85e 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)