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

Side by Side Diff: build/config/nacl/config.gni

Issue 1517203002: Fix nacl_tuple "Undefined identifier" gn gen failure for arm64 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enable_nacl Created 5 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni")
6
5 declare_args() { 7 declare_args() {
6 # Native Client supports both Newlib and Glibc C libraries where Newlib 8 # Native Client supports both Newlib and Glibc C libraries where Newlib
7 # is assumed to be the default one; use this to determine whether Glibc 9 # is assumed to be the default one; use this to determine whether Glibc
8 # is being used instead. 10 # is being used instead.
9 is_nacl_glibc = false 11 is_nacl_glibc = false
10 } 12 }
11 13
12 nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86" 14 is_nacl_irt = false
15 is_nacl_nonsfi = false
13 16
14 if (is_nacl_glibc) { 17 if (enable_nacl) {
15 if (current_cpu == "x86" || current_cpu == "x64") { 18 nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"
16 nacl_toolchain_package = "nacl_x86_glibc" 19
20 if (is_nacl_glibc) {
21 if (current_cpu == "x86" || current_cpu == "x64") {
22 nacl_toolchain_package = "nacl_x86_glibc"
23 } else if (current_cpu == "arm") {
24 nacl_toolchain_package = "nacl_arm_glibc"
25 }
26 } else {
27 nacl_toolchain_package = "pnacl_newlib"
28 }
29
30 if (current_cpu == "pnacl") {
31 _nacl_tuple = "pnacl"
32 } else if (current_cpu == "x86" || current_cpu == "x64") {
33 _nacl_tuple = "x86_64-nacl"
17 } else if (current_cpu == "arm") { 34 } else if (current_cpu == "arm") {
18 nacl_toolchain_package = "nacl_arm_glibc" 35 _nacl_tuple = "arm-nacl"
36 } else if (current_cpu == "mipsel") {
37 _nacl_tuple = "mipsel-nacl"
19 } 38 }
20 } else { 39
21 nacl_toolchain_package = "pnacl_newlib" 40 nacl_toolchain_bindir = "${nacl_toolchain_dir}/${nacl_toolchain_package}/bin"
41 nacl_toolchain_tooldir =
42 "${nacl_toolchain_dir}/${nacl_toolchain_package}/${_nacl_tuple}"
43 nacl_toolprefix = "${nacl_toolchain_bindir}/${_nacl_tuple}-"
44
45 nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + target_cpu
46 is_nacl_irt = current_toolchain == nacl_irt_toolchain
47
48 # Non-SFI mode is a lightweight sandbox used by Chrome OS for running ARC
49 # applications.
50 nacl_nonsfi_toolchain = "//build/toolchain/nacl:newlib_pnacl_nonsfi"
51 is_nacl_nonsfi = current_toolchain == nacl_nonsfi_toolchain
22 } 52 }
23
24 if (current_cpu == "pnacl") {
25 nacl_tuple = "pnacl"
26 } else if (current_cpu == "x86" || current_cpu == "x64") {
27 nacl_tuple = "x86_64-nacl"
28 } else if (current_cpu == "arm") {
29 nacl_tuple = "arm-nacl"
30 } else if (current_cpu == "mipsel") {
31 nacl_tuple = "mipsel-nacl"
32 }
33
34 nacl_toolchain_bindir = "${nacl_toolchain_dir}/${nacl_toolchain_package}/bin"
35 nacl_toolchain_tooldir =
36 "${nacl_toolchain_dir}/${nacl_toolchain_package}/${nacl_tuple}"
37 nacl_toolprefix = "${nacl_toolchain_bindir}/${nacl_tuple}-"
38
39 nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + target_cpu
40 is_nacl_irt = current_toolchain == nacl_irt_toolchain
41
42 # Non-SFI mode is a lightweight sandbox used by Chrome OS for running ARC
43 # applications.
44 nacl_nonsfi_toolchain = "//build/toolchain/nacl:newlib_pnacl_nonsfi"
45 is_nacl_nonsfi = current_toolchain == nacl_nonsfi_toolchain
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698