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

Unified Diff: ports/unzip/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/unzip/build.sh
diff --git a/ports/unzip/build.sh b/ports/unzip/build.sh
index 7a95ee34a6a2972bd55ef2b38a0258de128e343c..1860ac8ec95541aa954de0616e4ad2dbda74e72f 100644
--- a/ports/unzip/build.sh
+++ b/ports/unzip/build.sh
@@ -4,8 +4,9 @@
BUILD_DIR=${SRC_DIR}
+EnableCliMain
+
NACLPORTS_CPPFLAGS+=" -DHAVE_TERMIOS_H -DNO_CHMOD -DNO_FCHMOD -DNO_LCHMOD"
-NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"
EXECUTABLES="funzip unzip unzipsfx"
@@ -20,8 +21,8 @@ BuildStep() {
# (e.g., libppapi).
make -j${OS_JOBS} -f unix/Makefile unzips \
CC=${NACLCC} LD=${NACLCXX} \
- CFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CFLAGS}" LF2= \
- LFLAGS1="${NACLPORTS_LDFLAGS} ${NACL_CLI_MAIN_LIB}"
+ CFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CFLAGS}" \
+ LFLAGS1="${NACLPORTS_LDFLAGS}" LF2="${NACLPORTS_LIBS}"
}
InstallStep() {
« ports/twm/build.sh ('K') | « ports/twm/build.sh ('k') | ports/vim/nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698