Simplify cli_main

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 77 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 -uPSUserCreateInstance -lcli_main"
+export NACL_CLI_MAIN_LIB="-Xlinker -uPSUserCreateInstance \
+  -lcli_main -lnacl_spawn"
 
 # 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 1427 matching lines @@
 # These functions are called when this script is imported to do
 # any essential checking/setup operations.
 ######################################################################
 CheckToolchain
 CheckPatchVersion
 PatchSpecsFile
 InjectSystemHeaders
 InstallConfigSite
 GetRevision
 MakeDirs