Chromium Code Reviews| Index: build/common.gypi |
| =================================================================== |
| --- build/common.gypi (revision 11553) |
| +++ build/common.gypi (working copy) |
| @@ -152,16 +152,6 @@ |
| 'USE_EABI_HARDFLOAT=0', |
| ], |
| }], |
| - # The ARM assembler assumes the host is 32 bits, |
| - # so force building 32-bit host tools. |
| - ['host_arch=="x64" or OS=="android"', { |
| - 'target_conditions': [ |
| - ['_toolset=="host"', { |
| - 'cflags': ['-m32'], |
| - 'ldflags': ['-m32'], |
| - }], |
| - ], |
| - }], |
| ], |
| }], |
| ['v8_target_arch=="ia32"', { |
| @@ -223,16 +213,6 @@ |
| ['mips_arch_variant=="loongson"', { |
| 'defines': ['_MIPS_ARCH_LOONGSON',], |
| }], |
| - # The MIPS assembler assumes the host is 32 bits, |
| - # so force building 32-bit host tools. |
| - ['host_arch=="x64"', { |
| - 'target_conditions': [ |
| - ['_toolset=="host"', { |
| - 'cflags': ['-m32'], |
| - 'ldflags': ['-m32'], |
| - }], |
| - ], |
| - }], |
| ], |
| }], |
| ['v8_target_arch=="x64"', { |
| @@ -290,14 +270,6 @@ |
| ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
| or OS=="netbsd"', { |
| 'conditions': [ |
| - [ 'v8_target_arch!="x64"', { |
| - # Pass -m32 to the compiler iff it understands the flag. |
| - 'variables': { |
| - 'm32flag': '<!((echo | $(echo ${CXX:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', |
| - }, |
| - 'cflags': [ '<(m32flag)' ], |
| - 'ldflags': [ '<(m32flag)' ], |
| - }], |
| [ 'v8_no_strict_aliasing==1', { |
| 'cflags': [ '-fno-strict-aliasing' ], |
| }], |
| @@ -306,6 +278,26 @@ |
| ['OS=="solaris"', { |
| 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. |
| }], |
| + ['v8_target_arch!="x64"', { |
|
Jakob Kummerow
2012/05/15 14:05:34
The condition must check for OS as well, as the sh
yongsheng
2012/05/15 14:20:49
I'll change it.
yongsheng
2012/05/15 14:36:03
Sorry, I forget "Android". will add it.
|
| + # Check whether the host compiler and target compiler support '-m32' option and set it if yes |
|
Jakob Kummerow
2012/05/15 14:05:34
nit: for comments, please keep the 80-col limit pe
yongsheng
2012/05/15 14:20:49
okay,thanks a lot for your review.
|
| + # except that 'v8_target_arch'is x64 |
| + 'target_conditions': [ |
| + ['_toolset=="host"', { |
| + 'variables': { |
| + 'm32flag': '<!((echo | $(echo ${CXX_host:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', |
| + }, |
| + 'cflags': [ '<(m32flag)' ], |
| + 'ldflags': [ '<(m32flag)' ], |
| + }], |
| + ['_toolset=="target"', { |
| + 'variables': { |
| + 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', |
| + }, |
| + 'cflags': [ '<(m32flag)' ], |
| + 'ldflags': [ '<(m32flag)' ], |
| + }], |
| + ], |
| + }], |
| ], # conditions |
| 'configurations': { |
| 'Debug': { |