Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: ports/perl/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
« no previous file with comments | « ports/pango/nacl.patch ('k') | ports/perl/nacl.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/perl/build.sh
diff --git a/ports/perl/build.sh b/ports/perl/build.sh
index 6313450c912150402fdd38fc08ce91777ecae305..01f02bc6f5a7350b6d58b5b09444ec58183280a8 100644
--- a/ports/perl/build.sh
+++ b/ports/perl/build.sh
@@ -8,17 +8,15 @@ export BUILD_LD=cc
# use -Wno-return-type to suppress return-type errors encountered
# with pnacl, arm's clang-newlib (microperl)
NACLPORTS_CFLAGS_MICRO=$NACLPORTS_CFLAGS
-NACLPORTS_CFLAGS_MICRO+=" -Dmain=nacl_main -Wno-return-type "
+NACLPORTS_CFLAGS_MICRO+=" -Wno-return-type "
NACLPORTS_CFLAGS+=" -I${NACL_SDK_ROOT}/include -I${NACLPORTS_INCLUDE} \
-Wno-return-type"
BUILD_DIR=${SRC_DIR}
# keeping microperl for now
EXECUTABLES="perl microperl"
-NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}"
# we need a working perl on host to build things for target
HOST_BUILD=${WORK_DIR}/build_host
ARCH_DIR=${PUBLISH_DIR}/${NACL_ARCH}
-NACLPORTS_LIBS=" ${NACL_CLI_MAIN_LIB}"
# PNaCl and newlib dont have dynamic loading, so
# using Perl's internal stub file dl_none.xs
# specifically for systems which do not support it
@@ -60,6 +58,7 @@ if [ "${NACL_ARCH}" = "pnacl" ] ; then
NONXS_EXT="Errno"
fi
+EnableCliMain
EnableGlibcCompat
# BuildHostMiniperl builds miniperl for host, which is needed for
@@ -135,7 +134,7 @@ BuildStep() {
# microperl build from Makefile.micro
LogExecute make -j${OS_JOBS} -f Makefile.micro CC="${NACLCC}" \
CCFLAGS=" -c -DHAS_DUP2 -DPERL_MICRO ${NACLPORTS_CFLAGS_MICRO}" \
- LDFLAGS="${NACLPORTS_LDFLAGS}"
+ LDFLAGS="${NACLPORTS_LDFLAGS}" LIBS="${NACLPORTS_LIBS}"
# now make perl
LogExecute cp -f microperl ${HOST_BUILD}
LogExecute make clean
« no previous file with comments | « ports/pango/nacl.patch ('k') | ports/perl/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698