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

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: Remove the unnecessary imports 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..d36975d4581f381ab259a50453c751a1afa35a3c 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,19 @@ config("default_warnings") {
"-Wno-bitfield-width",
]
}
+
+ if (is_nacl_nonsfi) {
brettw 2015/10/23 09:38:13 This block seems very strange to me. Why are we di
Petr Hosek 2015/10/23 17:53:07 I originally copied the configuration from Gyp but
+ cflags += [
+ # Disables
+ "-Wno-c++11-extensions",
+ "-Wno-char-subscripts",
+ "-Wno-extra-semi",
+ "-Wno-unnamed-type-template-args",
+ "-Wno-unused-private-field",
+ "-Wno-unused-function",
+ "-Wno-sign-compare",
+ ]
+ }
}
}
« base/BUILD.gn ('K') | « base/process/BUILD.gn ('k') | build/config/nacl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698