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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1418653002: Synchronize GN build configuration with Chrome (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Review feedback addressed 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
« no previous file with comments | « build/config/nacl/BUILD.gn ('k') | build/toolchain/gcc_toolchain.gni » ('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 325dfd54447d362f345dbbd1f7d4d000063ba3e3..b743910ef4a8e4a950a92c5595d181b6cbc3a0e8 100644
--- a/build/config/nacl/config.gni
+++ b/build/config/nacl/config.gni
@@ -7,8 +7,9 @@ declare_args() {
# is assumed to be the default one; use this to determine whether Glibc
# is being used instead.
is_nacl_glibc = false
-
- # Native Client has a portable (PNaCl) and native variant; use this to
- # determine which one is currently being used.
- is_pnacl = false
}
+
+nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"
+
+nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + target_cpu
+is_nacl_irt = current_toolchain == nacl_irt_toolchain
« no previous file with comments | « build/config/nacl/BUILD.gn ('k') | build/toolchain/gcc_toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698