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

src/native_client/site_scons/site_tools/component_builders.py

 #!/usr/bin/python2.4
 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 106 matching lines @@
 
   # Add all keyword arguments to the environment
   for k, v in kwargs.items():
     env[k] = v
 
   # Add compiler flags for included headers, if any
   env['INCLUDES'] = env.Flatten(env.subst_list(['$INCLUDES']))
   for h in env['INCLUDES']:
     env.Append(CCFLAGS=['${CCFLAG_INCLUDE}%s' % h])
 
-  # This supports a NaCl convention that was previously supported with a
-  # modification to SCons.  Previously, EXTRA_LIBS was interpolated into LIBS
-  # using the ${EXTRA_LIBS} syntax.  It appears, however, that SCons naturally
-  # computes library dependencies before interpolation, so EXTRA_LIBS will not
-  # be correctly depended upon if interpolated.  In the past, SCons was modified
-  # to force interpolation before library dependencies were computed.  This new
-  # approach allows us to use an unmodified version of SCons.
-  # In general, the use of EXTRA_LIBS is discouraged.
-  if 'EXTRA_LIBS' in env:
-    env['LIBS'] = env['EXTRA_LIBS'] + env['LIBS']
-
   # Call platform-specific component setup function, if any
   if env.get('COMPONENT_PLATFORM_SETUP'):
     env['COMPONENT_PLATFORM_SETUP'](env, builder_name)
 
   # Return the modified environment
   return env
 
 #------------------------------------------------------------------------------
 
 # TODO: Should be possible to refactor programs, test programs, libs to all
@@ skipping 473 matching lines @@
   AddTargetGroup('all_libraries', 'libraries can be built')
   AddTargetGroup('all_programs', 'programs can be built')
   AddTargetGroup('all_test_programs', 'tests can be built')
   AddTargetGroup('all_packages', 'packages can be built')
   AddTargetGroup('run_all_tests', 'tests can be run')
   AddTargetGroup('run_disabled_tests', 'tests are disabled')
   AddTargetGroup('run_small_tests', 'small tests can be run')
   AddTargetGroup('run_medium_tests', 'medium tests can be run')
   AddTargetGroup('run_large_tests', 'large tests can be run')