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

Side by Side Diff: ports/curl/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, 1 month 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2013 The Native Client Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 export ac_cv_func_gethostbyname=yes 5 export ac_cv_func_gethostbyname=yes
6 export ac_cv_func_getaddrinfo=no 6 export ac_cv_func_getaddrinfo=no
7 export ac_cv_func_connect=yes 7 export ac_cv_func_connect=yes
8 8
9 # Can't use LIBS here otherwise nacl-spawn gets linked into the libcurl.so 9 # Can't use LIBS here otherwise nacl-spawn gets linked into the libcurl.so
10 # which we don't ever want. 10 # which we don't ever want.
11 export EXTRA_LIBS="${NACL_CLI_MAIN_LIB} -l${NACL_CXX_LIB}" 11 export EXTRA_LIBS="${NACL_CLI_MAIN_LIB}"
binji 2015/10/27 21:52:38 Why not EnableCliMain?
Sam Clegg 2015/10/28 17:06:30 The comment above explains why.
12 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LDFLAGS}"
12 13
13 EnableGlibcCompat 14 EnableGlibcCompat
14 15
15 EXECUTABLES="src/curl${NACL_EXEEXT}" 16 EXECUTABLES="src/curl${NACL_EXEEXT}"
16 17
17 EXTRA_CONFIGURE_ARGS+=" --without-libssh2" 18 EXTRA_CONFIGURE_ARGS+=" --without-libssh2"
18 if [ "${NACL_DEBUG}" = "1" ]; then 19 if [ "${NACL_DEBUG}" = "1" ]; then
19 NACLPORTS_CPPFLAGS+=" -DDEBUGBUILD" 20 NACLPORTS_CPPFLAGS+=" -DDEBUGBUILD"
20 EXTRA_CONFIGURE_ARGS+=" --enable-debug --disable-curldebug" 21 EXTRA_CONFIGURE_ARGS+=" --enable-debug --disable-curldebug"
21 fi 22 fi
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 ${PUBLISH_DIR}/curl*${NACL_EXEEXT} \ 58 ${PUBLISH_DIR}/curl*${NACL_EXEEXT} \
58 -L${DESTDIR_LIB} \ 59 -L${DESTDIR_LIB} \
59 -s . \ 60 -s . \
60 -o curl.nmf 61 -o curl.nmf
61 popd 62 popd
62 63
63 InstallNaClTerm ${PUBLISH_DIR} 64 InstallNaClTerm ${PUBLISH_DIR}
64 LogExecute cp ${START_DIR}/index.html ${PUBLISH_DIR} 65 LogExecute cp ${START_DIR}/index.html ${PUBLISH_DIR}
65 LogExecute cp ${START_DIR}/curl.js ${PUBLISH_DIR} 66 LogExecute cp ${START_DIR}/curl.js ${PUBLISH_DIR}
66 } 67 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698