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

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

index b39ec1358783c59ef804eb4ad79136d7e2ff1741..64bb31871563a411e1afa423dfaf821407bdb7f4 100644

--- a/ports/devenv/build.sh

+++ b/ports/devenv/build.sh

@@ -2,7 +2,7 @@

# Use of this source code is governed by a BSD-style license that can be

# found in the LICENSE file.

-export EXTRA_LIBS="${NACL_CLI_MAIN_LIB}"

+EnableCliMain

NACLPORTS_CPPFLAGS+=" -Dpipe=nacl_spawn_pipe"

EXECUTABLES="tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \

@@ -22,14 +22,14 @@ BuildStep() {

LogExecute ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -O2 \

${START_DIR}/jseval.c \

-o ${BUILD_DIR}/jseval/jseval_${NACL_ARCH}${NACL_EXEEXT} \

- ${EXTRA_LIBS}

+ ${LIBS}

# Build test module.

MakeDir ${BUILD_DIR}/tests

LogExecute ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -g \

${START_DIR}/tests/devenv_small_test.cc \

-o ${BUILD_DIR}/tests/devenv_small_test_${NACL_ARCH}${NACL_EXEEXT} \

- -lgtest ${EXTRA_LIBS}

+ -lgtest ${LIBS}

}

InstallStep() {

« ports/curl/build.sh ('K') | « ports/curl/nacl.patch ('k') | ports/devenv/jseval.c » ('j') | ports/font-util/build.sh » ('J')