Simplify cli_main

ports/python-static/build.sh

 # Copyright (c) 2014 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.
 
 EXECUTABLES=python${NACL_EXEEXT}
 
 # Workaround for arm-gcc bug:
 # https://code.google.com/p/nativeclient/issues/detail?id=3205
 # TODO(sbc): remove this once the issue is fixed
 if [ "${NACL_ARCH}" = "arm" ]; then
@@ skipping 19 matching lines @@
   EXTRA_CONFIGURE_ARGS="--disable-ipv6"
   EXTRA_CONFIGURE_ARGS+=" --with-suffix=${NACL_EXEEXT}"
   EXTRA_CONFIGURE_ARGS+=" --build=i686-linux-gnu --disable-shared --enable-static"
   export SO=.a
   export MAKEFLAGS="PGEN=${NACL_HOST_PYBUILD}/Parser/pgen"
   export LIBS="-ltermcap"
   export DYNLOADFILE=dynload_ppapi.o
   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/
   # This next step is costly, but it sets the environment variables correctly.
   DefaultConfigureStep
 
   LogExecute cp ${START_DIR}/Setup.local Modules/
   cat ${DEST_PYTHON_OBJS}/*.list >> Modules/Setup.local
   PY_MOD_LIBS=""
   for MODFILE in ${DEST_PYTHON_OBJS}/*.libs ; do
     if [ -e ${MODFILE} ]; then
       source ${MODFILE}
     fi
   done
   LogExecute rm -vf libpython2.7.a
   PY_LINK_LINE+="ppapi_wrapper ${DEST_PYTHON_OBJS}/\*/\*.o"
   # 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"

[bradn, 2015/02/13 02:12:32]

Don't you want to drop this -lcli_main ?
I thought this one didn't actually use cli_main?

[gdeepti, 2015/02/13 21:43:56]

I think this one still uses cli_main as the entry point.

   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
   echo ${PY_LINK_LINE} >> Modules/Setup.local
   # At this point we use the existing environment variables from
   # DefaultConfigureStep to build our destination Python modules
 }
 
 BuildStep() {
   SetupCrossEnvironment
   export CROSS_COMPILE=true
   export MAKEFLAGS="PGEN=${NACL_HOST_PYBUILD}/Parser/pgen"
   DefaultBuildStep
   ChangeDir ${BUILD_DIR}
   Banner "Rebuilding libpython2.7.a"
   ${AR} cr libpython2.7.a ${DEST_PYTHON_OBJS}/*/*.o
   ${RANLIB} libpython2.7.a
   # To avoid rebuilding python.nexe with the new libpython2.7.a and duplicating
   # symbols
   LogExecute touch python${NACL_EXEEXT}
   # The modules get built with SO=so, but they need to be SO=a inside the
   # destination filesystem.
   for fn in $(find ${NACL_DEST_PYROOT}/${SITE_PACKAGES} -name "*.so"); do
     LogExecute touch ${fn%%so}a
     LogExecute rm -v ${fn}
   done
 }