ports/toybox/build.sh - Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point

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: ports/toybox/build.sh

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments

Download patch

Index: ports/toybox/build.sh

diff --git a/ports/toybox/build.sh b/ports/toybox/build.sh

index e109f455c40dd55659e997fce9f6320a8cd4a981..d8e25da3012e0cb7c0497e2a2849f865e34d77c9 100644

--- a/ports/toybox/build.sh

+++ b/ports/toybox/build.sh

@@ -8,16 +8,13 @@ EXECUTABLES="toybox"

BUILD_DIR=${SRC_DIR}

NACLPORTS_CPPFLAGS+=" -DBYTE_ORDER=LITTLE_ENDIAN"

-NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"

NACLPORTS_CPPFLAGS+=" -Dpipe=nacl_spawn_pipe"

-NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}"

export HOSTCC=cc

+EnableCliMain

EnableGlibcCompat

-NACLPORTS_LDFLAGS+=" -l${NACL_CXX_LIB}"

ConfigureStep() {

LogExecute cp ${START_DIR}/toybox.config ${SRC_DIR}/.config

}

@@ -34,6 +31,7 @@ BuildStep() {

export CROSS_COMPILE="${NACL_CROSS_PREFIX}-"

export LDFLAGS="${NACLPORTS_LDFLAGS}"

export CFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CFLAGS}"

+ export LIBS="${NACLPORTS_LIBS}"

export CC

LogExecute make clean

DefaultBuildStep

« no previous file with comments | « ports/tk/build.sh ('k') | ports/toybox/nacl.patch » ('j') | no next file with comments »