Revert r4644, "Updated NaCl's build system to use SCons 2.0.1."

src/native_client/SConstruct

 # -*- python -*-
 # Copyright 2008 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.
 
 import atexit
 import glob
 import os
 import platform
 import stat
@@ skipping 1641 matching lines @@
     ],
   CPPPATH = ['${SOURCE_ROOT}'],
 
   EXTRA_CFLAGS = [],
   EXTRA_CCFLAGS = [],
   EXTRA_CXXFLAGS = [],
   EXTRA_LIBS = [],
   CFLAGS = ['${EXTRA_CFLAGS}'],
   CCFLAGS = ['${EXTRA_CCFLAGS}'],
   CXXFLAGS = ['${EXTRA_CXXFLAGS}'],
+  LIBS = ['${EXTRA_LIBS}'],
 )
 
 base_env.Append(
   BUILD_SCONSCRIPTS = [
     # KEEP THIS SORTED PLEASE
     'src/shared/gio/build.scons',
     'src/shared/imc/build.scons',
     'src/shared/platform/build.scons',
     'src/shared/ppapi/build.scons',
     'src/shared/ppapi_proxy/build.scons',
@@ skipping 418 matching lines @@
               werror_flags +
               ['${EXTRA_CCFLAGS}'] ,
     CPPPATH = ['$SOURCE_ROOT'],
     CFLAGS = ['-std=gnu99',
               ] +
              ['${EXTRA_CFLAGS}'],
     CXXFLAGS = ['-std=gnu++98',
                 '-Wno-long-long',
                 ] +
                ['${EXTRA_CXXFLAGS}'],
-    LIBS = [],
+    LIBS = ['${EXTRA_LIBS}'],
     LINKFLAGS = ['${EXTRA_LINKFLAGS}'],
     CPPDEFINES = [
       # _GNU_SOURCE ensures that strtof() gets declared.
       ['_GNU_SOURCE', 1],
       # This ensures that PRId64 etc. get defined.
       ['__STDC_FORMAT_MACROS', '1'],
       # strdup, and other common stuff
       ['_BSD_SOURCE', '1'],
       ['_POSIX_C_SOURCE', '199506'],
       ['_XOPEN_SOURCE', '600'],
@@ skipping 636 matching lines @@
 Default(['all_programs', 'all_bundles', 'all_test_programs', 'all_libraries'])
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')