Switch from using 'nacl_main' to 'main' entry point

build_tools/common.sh

 # Copyright (c) 2012 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.
 #
 # Environment variable NACL_ARCH should be set to one of the following
 # values: i686 x86_64 pnacl arm
 
 
 # NAMING CONVENTION
 # =================
@@ skipping 101 matching lines @@
 # Set NACL_SHARED when we want to build shared libraries.
 if [ "${NACL_LIBC}" = "glibc" -o "${NACL_LIBC}" = "bionic" ]; then
   NACL_SHARED=1
 else
   NACL_SHARED=0
 fi
 
 # libcli_main.a has a circular dependency which makes static link fail
 # (cli_main => nacl_io => ppapi_cpp => cli_main). To break this loop,
 # you should use this instead of -lcli_main.
-export NACL_CLI_MAIN_LIB="-Xlinker -unacl_main -Xlinker -uPSUserMainGet \
--lcli_main -lnacl_spawn -ltar -lppapi_simple -lnacl_io \
--lppapi -l${NACL_CXX_LIB}"
-export NACL_CLI_MAIN_LIB_CPP="-Xlinker -unacl_main -Xlinker -uPSUserMainGet \
--lcli_main -lnacl_spawn -ltar -lppapi_simple_cpp -lnacl_io \
--lppapi_cpp -lppapi -l${NACL_CXX_LIB}"
+NACL_CLI_MAIN_LDFLAGS="-Xlinker -uPSUserMainGet"
+NACL_CLI_MAIN_LIB="-lcli_main -lnacl_spawn -ltar -lppapi_simple \
+-lnacl_io -lppapi -l${NACL_CXX_LIB}"
+NACL_CLI_MAIN_LIB_CPP="-lcli_main -lnacl_spawn -ltar -lppapi_simple_cpp \
+-lnacl_io  -lppapi_cpp -lppapi -l${NACL_CXX_LIB}"
 
 # Python variables
 NACL_PYSETUP_ARGS=""
 NACL_BUILD_SUBDIR=build
 NACL_INSTALL_SUBDIR=install
 
 # output directories
 readonly NACL_PACKAGES_OUT=${NACL_SRC}/out
 readonly NACL_PACKAGES_ROOT=${NACL_PACKAGES_OUT}/packages
 readonly NACL_PACKAGES_BUILD=${NACL_PACKAGES_OUT}/build
@@ skipping 362 matching lines @@
     NACLPORTS_CXXFLAGS+=" -g -O0"
   else
     NACLPORTS_CFLAGS+=" -DNDEBUG -O2"
     NACLPORTS_CXXFLAGS+=" -DNDEBUG -O2"
     if [ "${NACL_ARCH}" = "pnacl" ]; then
       NACLPORTS_LDFLAGS+=" -DNDEBUG -O2"
     fi
   fi
 }
 
+EnableCliMain() {
+  NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LDFLAGS}"
+  NACLPORTS_LIBS+=" ${NACL_CLI_MAIN_LIB}"
+}
+
+EnableCliMainCxx() {
+  NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LDFLAGS}"
+  NACLPORTS_LIBS+=" ${NACL_CLI_MAIN_LIB_CPP}"
+}
+
 EnableGlibcCompat() {
   if [ "${NACL_LIBC}" = "newlib" ]; then
     NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
     NACLPORTS_LIBS+=" -lglibc-compat"
   fi
 }
 
 #
 # Attempt to download a file from a given URL
 # $1 - URL to fetch
@@ skipping 245 matching lines @@
     MAKEFLAGS+=" CONFIG=Debug"
   else
     MAKEFLAGS+=" CONFIG=Release"
   fi
   if [ "${VERBOSE:-}" = "1" ]; then
     MAKEFLAGS+=" V=1"
   fi
   export MAKEFLAGS
 
   BUILD_DIR=${START_DIR}
+  echo "LDFLAGS=${LDFLAGS}"
 }
 
 SetupCrossPaths() {
   export PKG_CONFIG_LIBDIR="${NACLPORTS_LIBDIR}/pkgconfig"
   # By default PKG_CONFIG_PATH is set to <libdir>/pkgconfig:<datadir>/pkgconfig.
   # While PKG_CONFIG_LIBDIR overrides <libdir>, <datadir> (/usr/share/) can only
   # be overridden individually when pkg-config is built.
   # Setting PKG_CONFIG_PATH instead to compensate.
   export PKG_CONFIG_PATH="${NACLPORTS_LIBDIR}/pkgconfig"
   PKG_CONFIG_PATH+=":${NACLPORTS_LIBDIR}/../share/pkgconfig"
@@ skipping 11 matching lines @@
   export CC=${NACLCC}
   export CXX=${NACLCXX}
   export AR=${NACLAR}
   export RANLIB=${NACLRANLIB}
   export READELF=${NACLREADELF}
   export STRIP=${NACLSTRIP}
 
   export CFLAGS=${NACLPORTS_CFLAGS}
   export CPPFLAGS=${NACLPORTS_CPPFLAGS}
   export CXXFLAGS=${NACLPORTS_CXXFLAGS}
-  export LDFLAGS="${NACLPORTS_LDFLAGS} ${NACLPORTS_LIBS}"
+  export LDFLAGS=${NACLPORTS_LDFLAGS}
   export ARFLAGS=${NACL_ARFLAGS}
   export AR_FLAGS=${NACL_ARFLAGS}
   export LIBS=${LIBS:-${NACLPORTS_LIBS}}
 
   echo "CPPFLAGS=${CPPFLAGS}"
   echo "CFLAGS=${CFLAGS}"
   echo "CXXFLAGS=${CXXFLAGS}"
   echo "LDFLAGS=${LDFLAGS}"
   echo "LIBS=${LIBS}"
 }
@@ skipping 767 matching lines @@
 ######################################################################
 # Always run
 # These functions are called when this script is imported to do
 # any essential checking/setup operations.
 ######################################################################
 PatchSpecsFile
 InjectSystemHeaders
 InstallConfigSite
 GetRevision
 MakeDirs