Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 0974b49752e64eb3aaa4cd9c89bc79f6fbaeb110..0f731fe2f1d39df2bb507110408d1fa2cb138847 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -4226,9 +4226,15 @@ |
# Clang does not support the following options. |
'-finline-limit=64', |
], |
- 'cflags': [ |
- # TODO(gordanac) Enable integrated-as. |
- '-no-integrated-as', |
+ # TODO(gordanac) Enable integrated-as. |
+ 'cflags': [ '-no-integrated-as' ], |
Nico
2015/12/04 19:30:19
nit: Since you're touching this line anyways, mayb
gordanac
2015/12/04 19:47:31
Done.
|
+ 'conditions': [ |
+ ['OS=="android"', { |
+ 'cflags': [ |
+ # Else /usr/bin/as gets picked up. |
+ '-B<(android_toolchain)', |
+ ], |
+ }], |
], |
}], |
['clang==1 and OS=="android"', { |