build/config/nacl/config.gni - Issue 2051163002: Nuke NaCl SFI, part 1.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2051163002: Nuke NaCl SFI, part 1. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 4 years, 6 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 unified diff | Download patch

OLD	NEW
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 declare_args() {	5 declare_args() {

6 # Native Client supports both Newlib and Glibc C libraries where Newlib	6 # 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	7 # is assumed to be the default one; use this to determine whether Glibc

8 # is being used instead.	8 # is being used instead.

9 is_nacl_glibc = false	9 is_nacl_glibc = false

10	10

11 # TODO(ncbray): support ASAN once NaCl's GN build is unforked.	11 # TODO(ncbray): support ASAN once NaCl's GN build is unforked.

12 # TODO(cstout): support fnl/musl build in nacl	12 # TODO(cstout): support fnl/musl build in nacl

13 mojo_use_nacl_sfi = is_linux && !is_asan && !is_fnl

14 mojo_use_nacl_nonsfi = (is_linux \|\| is_android) && !is_asan && !is_fnl	13 mojo_use_nacl_nonsfi = (is_linux \|\| is_android) && !is_asan && !is_fnl

15 mojo_use_nacl = mojo_use_nacl_sfi \|\| mojo_use_nacl_nonsfi	14

	15 # TODO(vtl): This now seems totally redundant.

	16 mojo_use_nacl = mojo_use_nacl_nonsfi

16 }	17 }

17	18

18 nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"	19 nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"

19	20

20 nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + target_cpu	21 nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + target_cpu

21 is_nacl_irt = current_toolchain == nacl_irt_toolchain	22 is_nacl_irt = current_toolchain == nacl_irt_toolchain

OLD	NEW

« no previous file with comments | « PRESUBMIT.py ('k') | mojo/BUILD.gn » ('j') | no next file with comments »