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

src/native_client/site_scons/site_init.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 100 matching lines @@
       # directory. When we are passed a SConscript that is already under
       # $TARGET_ROOT, we should not use build_dir.
       ec.SConscript(c_script, exports={'env': ec}, duplicate=0)
     elif not ec.RelativePath('$MAIN_DIR', c_dir).startswith('..'):
       # The above expression means: if c_dir is $MAIN_DIR or anything
       # under it. Going from c_dir to $TARGET_ROOT and dropping the not fails
       # to include $MAIN_DIR.
       # Also, if we are passed a SConscript that
       # is not under $MAIN_DIR, we should fail loudly, because it is unclear how
       # this will correspond to things under $OBJ_ROOT.
-      ec.SConscript(c_script, variant_dir='$OBJ_ROOT/' + c_dir,
+      ec.SConscript(c_script, build_dir='$OBJ_ROOT/' + c_dir,
                     exports={'env': ec}, duplicate=0)
     else:
       raise SCons.Error.UserError(
           'Bad location for a SConscript. "%s" is not under '
           '\$TARGET_ROOT or \$MAIN_DIR' % c_script)
 
 def FilterEnvironments(environments):
   """Filters out the environments to be actually build from the specified list
 
   Args:
@@ skipping 226 matching lines @@
   # Since our site dir was specified on the SCons command line, SCons will
   # normally only look at our site dir.  Add back checking for project-local
   # site_scons directories.
   if not SCons.Script.GetOption('no_site_dir'):
     SCons.Script.Main._load_site_scons_dir(
         SCons.Node.FS.get_default_fs().SConstruct_dir, None)
 
 
 # Run main code
 SiteInitMain()