--- SConstruct.orig	Mon Mar 12 21:39:30 2007
+++ SConstruct	Sat Jun  2 03:49:26 2007
@@ -122,9 +122,11 @@
 #
 # Create configuration objects
 
+SConsignFile('build/scons-signatures')
+
 opts=cli_options()
 
-env=Environment(options=opts)
+env=Environment(options=opts, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
 env.Help(opts.GenerateHelpText(env))
 
 conf=env.Configure(conf_dir='#/build/sconf_temp',log_file='#build/config.log',
@@ -287,7 +289,6 @@
 
 ################################################################### Build things
 
-SConsignFile('build/scons-signatures')
 BUILDDIR='build/'+TARGET+'-'+env['build']
 Export('env', 'Glob', 'BUILDDIR', 'PhonyTarget')
 
