diff options
| author | egorbasharin <egorbasharin@yandex-team.ru> | 2022-02-10 16:51:37 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:51:37 +0300 |
| commit | fc96459a2fff1524815d05412458cac81420a8b7 (patch) | |
| tree | f976df1d5c284fd25f42b898da3334af85107485 /build/ymake_conf.py | |
| parent | a8d8e782feef008a200c4f327a31616464a764aa (diff) | |
| download | ydb-fc96459a2fff1524815d05412458cac81420a8b7.tar.gz | |
Restoring authorship annotation for <egorbasharin@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build/ymake_conf.py')
| -rwxr-xr-x | build/ymake_conf.py | 26 |
1 files changed, 13 insertions, 13 deletions
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) |