Simplify cli_main

ports/xorg-server/build.sh

 #!/bin/bash
 # 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.
 
 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/pixman-1"
 NACLPORTS_CPPFLAGS+=" -DFASYNC=O_NONBLOCK -DFNDELAY=O_NONBLOCK"
 
 EXECUTABLES=hw/kdrive/sdl/Xsdl${NACL_EXEEXT}
 
@@ skipping 16 matching lines @@
 
 if [ "${NACL_LIBC}" = "newlib" ]; then
   EXTRA_CONFIGURE_ARGS+=" --enable-xvfb=no"
   EXTRA_CONFIGURE_ARGS+=" --enable-xorg=no"
 fi
 
 NACLPORTS_CFLAGS+=" -Dmain=SDL_main"
 export LIBS+="\
 -Wl,--undefined=nacl_main \
 -Wl,--undefined=SDL_main \
--lnacl_spawn \
 -lSDLmain -lSDL \
 ${NACL_CLI_MAIN_LIB} \
 -lppapi_simple -ltar -lnacl_io -lRegal -lglslopt \
 -lppapi -lppapi_cpp -lppapi_gles2 -lm \
 -l${NACL_CPP_LIB}"
 
 if [ "${NACL_LIBC}" = "newlib" ]; then
   NACLPORTS_CFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
   export LIBS+=" -lglibc-compat"
 fi
@@ skipping 57 matching lines @@
            Xsdl.js; do
     LogExecute cp ${START_DIR}/${f} .
   done
 
   ChangeDir ${NACL_PREFIX}
   LogExecute tar cvf ${ASSEMBLY_DIR}/xorg-xkb.tar share/X11/xkb
 
   ChangeDir ${PUBLISH_DIR}
   LogExecute zip -r xorg-server.zip xorg-server
 }