build_tools/common.sh - Issue 907563002: Simplify cli_main

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_tools/common.sh

Issue 907563002: Simplify cli_main (Closed) Base URL: https://chromium.googlesource.com/external/naclports.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_tools/common.sh

diff --git a/build_tools/common.sh b/build_tools/common.sh

index 190fea93254d2c0350770b4227856e84dc3236bc..3a0f534f0af4d840ef9da234742bf02fbb90602c 100644

--- a/build_tools/common.sh

+++ b/build_tools/common.sh

@@ -95,7 +95,8 @@ fi

# libcli_main.a has a circular dependency which makes static link fail

# (cli_main => nacl_io => ppapi_cpp => cli_main). To break this loop,

# you should use this instead of -lcli_main.

-export NACL_CLI_MAIN_LIB="-Xlinker -uPSUserCreateInstance -lcli_main"

+export NACL_CLI_MAIN_LIB="-Xlinker -uPSUserCreateInstance \

+ -lcli_main -lnacl_spawn"

# Python variables

NACL_PYSETUP_ARGS=""