Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1446)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/common.gypi

Issue 1503523002: Put back path to Android MIPS gnu as for clang (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 0974b49752e64eb3aaa4cd9c89bc79f6fbaeb110..9b34c6b35f9abdf086f6be4a2dde5571c6a8ce5c 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': [ '-fno-integrated-as' ],
+ 'conditions': [
+ ['OS=="android"', {
+ 'cflags': [
+ # Else /usr/bin/as gets picked up.
+ '-B<(android_toolchain)',
+ ],
+ }],
],
}],
['clang==1 and OS=="android"', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698