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

ports/coreutils/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.
 
 BARE_EXECUTABLES="\
 [ basename cat chgrp chmod chown cksum comm cp csplit cut date dd df dir
 dircolors dirname du echo env expand expr factor false fmt fold ginstall head
 id join kill link ln logname ls md5sum mkdir mkfifo mknod mv nl
 nohup od paste pathchk pr printenv printf ptx pwd readlink rm rmdir seq
 sha1sum shred sleep sort split stat stty sum sync tac tail tee
 test touch tr true tsort tty unexpand uniq unlink uname vdir wc whoami yes"
 
 EXECUTABLES=""
 for exe in ${BARE_EXECUTABLES}; do
   EXECUTABLES+=" src/${exe}${NACL_EXEEXT}"
 done
 
 TRANSLATE_PEXES=no
 
-NACLPORTS_LIBS+=" ${NACL_CLI_MAIN_LIB}"
-NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"
-
+EnableCliMain
 EnableGlibcCompat
 
 ConfigureStep() {
   if [ "${TOOLCHAIN}" = "glibc" ]; then
     NACLPORTS_CPPFLAGS+=" -D_FORTIFY_SOURCE=0"
 
     # Glibc's *at functions don't work correctly since they rely on
     # /proc/self/fd/X.  This ensure thats gnulib's replacements are used
     # instead.
     export ac_cv_func_faccessat=no
@@ skipping 23 matching lines @@
   # we are cross compiling so this doesn't work.  Telling configure that perl
   # is missing sovles this issues as the expense of missing man pages.
   export PERL=missing
 
   # TODO(bradnelson): Re-enable when bots have a newer texinfo.
   # Disabling texinfo, as the version on the bots is too old.
   export MAKEINFO=true
 
   DefaultConfigureStep
 }