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

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

Issue 1395573003: Build nacl_helper_nonsfi with GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Set cflags locally rather than globally Created 5 years, 2 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 6b1e8979e35fe5f1352ff36680b6cb79ddcf7525..6fb09b89afa0f17a55cb10b71c550d4266204945 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -450,6 +450,30 @@ config("compiler_cpu_abi") {
]
ldflags += [ "-mips64r2" ]
}
+ } else if (current_cpu == "pnacl" && is_nacl_nonsfi) {
+ if (target_cpu == "x86" || target_cpu == "x64") {
+ cflags += [
+ "-arch",
+ "x86-32-nonsfi",
+ "--pnacl-bias=x86-32-nonsfi",
+ "--target=i686-unknown-nacl",
+ ]
+ ldflags += [
+ "-arch",
+ "x86-32-nonsfi",
+ "--target=i686-unknown-nacl",
+ ]
+ } else if (target_cpu == "arm") {
+ cflags += [
+ "-arch",
+ "arm-nonsfi",
+ "--pnacl-bias=arm-nonsfi",
+ ]
+ ldflags += [
+ "-arch",
+ "arm-nonsfi",
+ ]
+ }
}
}
@@ -758,6 +782,13 @@ config("default_warnings") {
"-Wno-bitfield-width",
]
}
+
+ if (is_nacl_nonsfi) {
+ cflags += [
+ # TODO(phosek): Enable this after fixing NaCl IRT.
+ "-Wno-sign-compare",
brettw 2015/10/25 08:45:33 Since this is already fixed, I'm OK adding is a te
Petr Hosek 2015/10/25 22:50:48 Done.
+ ]
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698