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

Unified Diff: ports/python-static/build.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ports/openssh/build.sh ('k') | ports/python-static/nacl.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/python-static/build.sh
diff --git a/ports/python-static/build.sh b/ports/python-static/build.sh
index fab33e82d0ed19d21a33cd76b79d814bfa43b9db..8da9a542df738e7db75b099a361ab7ba73514eb6 100644
--- a/ports/python-static/build.sh
+++ b/ports/python-static/build.sh
@@ -37,7 +37,7 @@ ConfigureStep() {
export MACHDEP=ppapi
export LINKCC=${NACLCXX}
if [ "${NACL_LIBC}" = "newlib" ]; then
- LIBS+=" -lglibc-compat -lc"
+ LIBS+=" -lglibc-compat"
NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
fi
LogExecute cp ${START_DIR}/dynload_ppapi.c ${SRC_DIR}/Python/
@@ -57,9 +57,9 @@ ConfigureStep() {
# Not sure why -uPSUserMainGet is needed here. NACL_CLI_MAIN_LIB already
# contains -uPSUserCreateInstance which should be enough to pull in both
# symbols (they live int he same object file in libcli_main.a).
- PY_LINK_LINE+=" ${PY_MOD_LIBS} -Wl,-uPSUserMainGet ${NACL_CLI_MAIN_LIB}"
+ PY_LINK_LINE+=" ${PY_MOD_LIBS} -Wl,-uPSUserMainGet -lcli_main -lnacl_spawn"
PY_LINK_LINE+=" -lz -lppapi_simple -lppapi -lppapi_cpp -lnacl"
- PY_LINK_LINE+=" -lnacl_io -lc -lbz2"
+ PY_LINK_LINE+=" -lnacl_io -lbz2"
if [ "${NACL_LIBC}" = "newlib" ]; then
PY_LINK_LINE+=" -lglibc-compat"
fi
« no previous file with comments | « ports/openssh/build.sh ('k') | ports/python-static/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698