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

Unified Diff: build/config/compiler/BUILD.gn

Issue 130923002: Make GN pass -target flags only on Android Clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months 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/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index ebfe51adde9156e26a0c81a1c7a090898f07aafb..623e81693617b97c0c7b55c396feef3be6d5b86f 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -211,15 +211,17 @@ config("compiler") {
]
}
- if (cpu_arch == "arm") {
- cflags += [
- "-target arm-linux-androideabi",
- "-mllvm -arm-enable-ehabi",
- ]
- ldflags += [ "-target arm-linux-androideabi" ]
- } else if (cpu_arch == "x86") {
- cflags += [ "-target x86-linux-androideabi" ]
- ldflags += [ "-target x86-linux-androideabi" ]
+ if (is_clang) {
+ if (cpu_arch == "arm") {
+ cflags += [
+ "-target arm-linux-androideabi",
+ "-mllvm -arm-enable-ehabi",
+ ]
+ ldflags += [ "-target arm-linux-androideabi" ]
+ } else if (cpu_arch == "x86") {
+ cflags += [ "-target x86-linux-androideabi" ]
+ ldflags += [ "-target x86-linux-androideabi" ]
+ }
}
}
}
« 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