Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 79d3f986192bbaf837dd0ca5cf28c76735f82604..00323f5cc7b5687c4b35910da8dcc56592ec0c70 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -3703,19 +3703,39 @@ |
['target_arch=="arm"', { |
'target_conditions': [ |
['_toolset=="target"', { |
- 'cflags_cc': [ |
- # The codesourcery arm-2009q3 toolchain warns at that the ABI |
- # has changed whenever it encounters a varargs function. This |
- # silences those warnings, as they are not helpful and |
- # clutter legitimate warnings. |
- '-Wno-abi', |
- ], |
'conditions': [ |
+ ['clang==0', { |
+ 'cflags_cc': [ |
+ # The codesourcery arm-2009q3 toolchain warns at that the ABI |
+ # has changed whenever it encounters a varargs function. This |
+ # silences those warnings, as they are not helpful and |
+ # clutter legitimate warnings. |
+ '-Wno-abi', |
+ ], |
+ }], |
+ ['clang==1 and arm_arch!=""', { |
+ 'cflags': [ |
+ '-target arm-linux-gnueabihf', |
+ # TODO(sbc): Remove this once the warning in libvpx is fixed: |
+ # https://code.google.com/p/webm/issues/detail?id=829 |
+ '-Wno-absolute-value', |
Nico
2014/08/08 15:28:44
nit: Normally, this should go into libvpx.gyp inst
|
+ ], |
+ 'ldflags': [ |
+ '-target arm-linux-gnueabihf', |
+ ], |
+ }], |
['arm_arch!=""', { |
'cflags': [ |
'-march=<(arm_arch)', |
], |
}], |
+ ['clang==1', { |
+ 'cflags': [ |
+ # We need to disable clang's builtin assember as it can't |
+ # handle a several of asm files. |
Nico
2014/08/08 15:28:44
Include link to http://crbug.com/124610 (the bug t
|
+ '-no-integrated-as', |
+ ], |
+ }], |
['arm_tune!=""', { |
'cflags': [ |
'-mtune=<(arm_tune)', |