Fix if-else. jumbo is_limit 10 for ix86, because gold linker still gave aerror of allocating memory.

This commit is contained in:
Mikhail Novosyolov 2018-10-23 03:43:47 +03:00
parent 9b152c93b6
commit 849af6d3e5

View file

@ -369,9 +369,9 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
%define localhost 0 %define localhost 0
%if 0%{localhost} %if 0%{localhost}
%ifarch %ix86 %ifarch %ix86
%define is_limit 50 %define is_limit 10
%else %else
%define is_limit 100 %define is_limit 50
%endif %endif
%else %else
%define is_limit 10 %define is_limit 10
@ -393,12 +393,13 @@ export NM=nm
%ifarch %ix86 %ifarch %ix86
# GNU ld linker got out of memory on i586 with jumbo is_limit=100. # GNU ld linker got out of memory on i586 with jumbo is_limit=100.
# Gold linker worked fine with jumbo is_limit=100 on i586. # Gold linker worked fine with jumbo is_limit=100 on i586.
%define linker_args use_gold=true use_lld=false %define linker_args use_gold=true
%endif %else
%ifarch x86_64 %ifarch x86_64
# If both gold and lld are false, GNU ld is used. # If both gold and lld are false, GNU ld is used.
%define linker_agrs use_gold=false use_lld=false is_cfi=false use_thin_lto=false %define linker_agrs use_gold=false use_lld=false is_cfi=false use_thin_lto=false
%endif %endif
%endif
%else %else
%define is_clang false %define is_clang false