Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index d53c6e6bffb182696eda85c1361b84edcf55359d..0e8338d45a15116a9f73bedbb07df5e2b1a2e1f7 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -301,64 +301,72 @@ |
| '-Wstrict-prototypes', |
| ], |
| }], |
| - [ 'target_arch=="arm"', { |
| - 'cflags': [ |
| + ['target_arch=="arm"', { |
| + 'target_conditions': [ |
| + ['_toolset=="target"', { |
| + 'cflags': [ |
| '-Wno-abi', |
| '-fno-exceptions', |
| '-Wall', |
| '-fPIC', |
| '--sysroot=<(sysroot)', |
| - ], |
| - 'ldflags': [ |
| + ], |
| + 'ldflags': [ |
| '--sysroot=<(sysroot)', |
| - ], |
| - # TODO(mcgrathr): This is copied from the arm section of |
| - # chromium/src/build/common.gypi, but these details really |
| - # should be more fully harmonized and shared. |
| - 'conditions': [ |
| + ], |
| + # TODO(mcgrathr): This is copied from the arm section of |
| + # chromium/src/build/common.gypi, but these details really |
| + # should be more fully harmonized and shared. |
| + 'conditions': [ |
| ['arm_thumb==1', { |
| - 'cflags': [ |
| - '-mthumb', |
| - ] |
| + 'cflags': [ |
| + '-mthumb', |
| + ] |
| }], |
| ['arm_version==7', { |
| - 'cflags': [ |
| - '-march=armv7-a', |
| - '-mtune=cortex-a9', |
| - '-mfloat-abi=<(arm_float_abi)', |
| - ], |
| - 'conditions': [ |
| - ['arm_neon==1', { |
| - 'cflags': [ '-mfpu=neon', ], |
| - }, { |
| - 'cflags': [ '-mfpu=<(arm_fpu)', ], |
| - }] |
| - ], |
| + 'cflags': [ |
| + '-march=armv7-a', |
| + '-mtune=cortex-a9', |
| + '-mfloat-abi=<(arm_float_abi)', |
| + ], |
| + 'conditions': [ |
| + ['arm_neon==1', { |
| + 'cflags': [ '-mfpu=neon', ], |
| + }, { |
| + 'cflags': [ '-mfpu=<(arm_fpu)', ], |
| + }] |
| + ], |
| }], |
| - ], |
| - }], |
| - ['target_arch=="mipsel"', { |
| - # Copied from chromium build/common.gypi |
| - 'conditions': [ |
| - ['mips_arch_variant=="mips32r2"', { |
| - 'cflags': ['-mips32r2'], |
| - }, { |
| - 'cflags': ['-mips32'], |
| - }], |
| - ], |
| - }], |
| - ['target_arch=="ia32" or target_arch=="x64"', { |
| - 'conditions': [ |
| - ['target_arch=="x64"', { |
| - 'variables': { |
| - 'mbits_flag': '-m64', |
| - }, |
| - }, { |
| - 'variables': { |
| - 'mbits_flag': '-m32', |
| - } |
| - },], |
| - ], |
| + ], |
| + }], |
| + ], |
| + }], |
| + ['target_arch=="mipsel"', { |
| + 'target_conditions': [ |
| + ['_toolset=="target"', { |
| + # Copied from chromium build/common.gypi |
| + 'conditions': [ |
| + ['mips_arch_variant=="mips32r2"', { |
| + 'cflags': ['-mips32r2'], |
| + }, { |
| + 'cflags': ['-mips32'], |
| + }], |
| + ], |
| + }], |
| + ], |
| + }], |
| + ['target_arch=="ia32" or target_arch=="x64"', { |
| + 'conditions': [ |
|
Mark Seaborn
2014/02/03 22:31:47
The indentation here doesn't match that of 'asflag
|
| + ['target_arch=="x64"', { |
| + 'variables': { |
| + 'mbits_flag': '-m64', |
| + }, |
| + }, { |
| + 'variables': { |
| + 'mbits_flag': '-m32', |
| + } |
| + },], |
| + ], |
| 'asflags': [ |
| '<(mbits_flag)', |
| ], |