Simplify cli_main

ports/curl/build.sh

 # Copyright (c) 2013 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 export ac_cv_func_gethostbyname=yes
 export ac_cv_func_getaddrinfo=no
 export ac_cv_func_connect=yes
 export LIBS="-lnacl_io -pthread -l${NACL_CPP_LIB}"
 
 if [ "${NACL_LIBC}" = "newlib" ]; then
@@ skipping 13 matching lines @@
   # rebuilt.  This is the only object that depends on the PPAPI
   # define and therefore will differ between PPAPI and sel_ldr
   # versions.
   Remove src/curl-tool_main.o
   DefaultBuildStep
 
   Banner "Build curl_ppapi"
   Remove  src/curl-tool_main.o
   sed -i.bak "s/CFLAGS = /CFLAGS = -DPPAPI /" src/Makefile
   sed -i.bak "s/curl\$(EXEEXT)/curl_ppapi\$(EXEEXT)/" src/Makefile
-  local sedlibs="-lppapi_simple,-lnacl_io,-lppapi_cpp,-lppapi,-lcli_main"
+  local sedlibs="-lppapi_simple,-lcli_main,-lnacl_spawn,"
+  sedlibs+="-lnacl_io,-lppapi_cpp,-lppapi"
   sedlibs="-Wl,--start-group,$sedlibs,--end-group -l${NACL_CPP_LIB}"
   sed -i.bak "s/LIBS = \$(BLANK_AT_MAKETIME)/LIBS = ${sedlibs}/" src/Makefile
   DefaultBuildStep
 }
 
 PublishStep() {
   PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/curl"
 
   if [ "${NACL_SHARED}" = "1" ]; then
     EXECUTABLE_DIR=.libs
@@ skipping 26 matching lines @@
       ${PUBLISH_DIR}/curl_ppapi*${NACL_EXEEXT} \
       -L${DESTDIR_LIB} \
       -s . \
       -o curl.nmf
   popd
 
   InstallNaClTerm ${PUBLISH_DIR}
   LogExecute cp ${START_DIR}/index.html ${PUBLISH_DIR}
   LogExecute cp ${START_DIR}/curl.js ${PUBLISH_DIR}
 }