shell/BUILD.gn - Issue 1348493002: Add fnl build target

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: shell/BUILD.gn

Issue 1348493002: Add fnl build target (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: rebased and fixed is_linux clang assumption in shell Created 5 years, 3 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: shell/BUILD.gn

diff --git a/shell/BUILD.gn b/shell/BUILD.gn

index 42473af0d7e2b4efa92e78592284b33a40a150b8..256bfd23651b562f937d3eb5f0111923bfb22935 100644

--- a/shell/BUILD.gn

+++ b/shell/BUILD.gn

@@ -126,7 +126,7 @@ if (!mojo_use_prebuilt_mojo_shell) {

group("mojo_shell_child_32_bit") {

# This group is required to run any 32-bit child process.

deps = []

- if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) {

+ if ((target_cpu == "x64" || target_cpu == "x86") && is_linux && !is_fnl) {

# The toolchain is hardcoded as 32-bit clang here -- although it must

# be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would

# be defined as the 32 bit variant of whatever is being used (be it clang,