build/config/features.gni - Issue 964003002: Fix 32-bit x86 Linux build for GN uploads.

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

Unified Diff: build/config/features.gni

Issue 964003002: Fix 32-bit x86 Linux build for GN uploads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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:

Index: build/config/features.gni

diff --git a/build/config/features.gni b/build/config/features.gni

index 90128c4d331e61e2b2bc159dd428f411ad0afa30..abafd1ce30379ee1344ba4a8b0325dfc83146925 100644

--- a/build/config/features.gni

+++ b/build/config/features.gni

@@ -32,8 +32,8 @@ declare_args() {

# the commented out logic.

# Eventually we want this to be:

# enable_nacl = !is_ios && !is_android

- enable_nacl = (is_linux && !is_chromeos && !is_debug &&

- build_cpu_arch == "x64") || is_nacl

+ enable_nacl =

+ (is_linux && !is_chromeos && !is_debug && current_cpu == "x64") || is_nacl

enable_nacl_untrusted = enable_nacl

enable_pnacl = enable_nacl_untrusted

« no previous file with comments | « no previous file | no next file » | no next file with comments »