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

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

Issue 1352313002: GN: Harmonize ARM compiler settings with GYP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 7cc2c39da9422ac403c70b1ae5fa0ffb5aabef6e..c822ca4a150037c91f434fe151bfca49ae416761 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -398,6 +398,20 @@ config("compiler") {
]
}
} else if (current_cpu == "arm") {
+ if (is_clang && !is_android && !is_nacl) {
+ cflags += [
+ "-target",
+ "arm-linux-gnueabihf",
+ ]
+ ldflags += [
+ "-target",
+ "arm-linux-gnueabihf",
+ ]
+
+ # We need to disable clang's builtin assembler as it can't
+ # handle several asm files, crbug.com/124610
+ cflags += [ "-no-integrated-as" ]
+ }
if (!is_nacl) {
cflags += [
"-march=$arm_arch",
« no previous file with comments | « build/config/arm.gni ('k') | build/config/sysroot.gni » ('j') | build/config/sysroot.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698