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

Unified Diff: build/config/nacl/config.gni

Issue 1443483004: Adding --no-nacl to gn disables nonsfi and sfi nacl from building. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month 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 | examples/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/nacl/config.gni
diff --git a/build/config/nacl/config.gni b/build/config/nacl/config.gni
index b743910ef4a8e4a950a92c5595d181b6cbc3a0e8..652c37a7e1e8365aae1ddf8dca4bef634b9ffdc9 100644
--- a/build/config/nacl/config.gni
+++ b/build/config/nacl/config.gni
@@ -7,6 +7,12 @@ declare_args() {
# is assumed to be the default one; use this to determine whether Glibc
# is being used instead.
is_nacl_glibc = false
+
+ # TODO(ncbray): support ASAN once NaCl's GN build is unforked.
+ # TODO(cstout): support fnl/musl build in nacl
+ mojo_use_nacl_sfi = is_linux && !is_asan && !is_fnl
+ mojo_use_nacl_nonsfi = (is_linux || is_android) && !is_asan && !is_fnl
+ mojo_use_nacl = mojo_use_nacl_sfi || mojo_use_nacl_nonsfi
}
nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"
« no previous file with comments | « no previous file | examples/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698