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

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

Issue 1415293005: GN: Strip NaCl IRT and save its .debug file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use bespoke action script 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 | « no previous file | build/toolchain/nacl/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..d04adb9681df6ce74371d1f273f5d098d54d83d2 100644
--- a/build/config/nacl/config.gni
+++ b/build/config/nacl/config.gni
@@ -11,5 +11,28 @@ declare_args() {
nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"
+if (is_nacl_glibc) {
+ if (current_cpu == "x86" || current_cpu == "x64") {
+ nacl_toolchain_package = "nacl_x86_glibc"
+ } else if (current_cpu == "arm") {
+ nacl_toolchain_package = "nacl_arm_glibc"
+ }
+} else {
+ nacl_toolchain_package = "pnacl_newlib"
+}
+
+if (current_cpu == "pnacl") {
+ nacl_tuple = "pnacl"
+} else if (current_cpu == "x86" || current_cpu == "x64") {
+ nacl_tuple = "x86_64-nacl"
+} else if (current_cpu == "arm") {
+ nacl_tuple = "arm-nacl"
+}
+
+nacl_toolchain_bindir = "${nacl_toolchain_dir}/${nacl_toolchain_package}/bin"
+nacl_toolchain_tooldir =
+ "${nacl_toolchain_dir}/${nacl_toolchain_package}/${nacl_tuple}"
+nacl_toolprefix = "${nacl_toolchain_bindir}/${nacl_tuple}-"
+
nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + target_cpu
is_nacl_irt = current_toolchain == nacl_irt_toolchain
« no previous file with comments | « no previous file | build/toolchain/nacl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698