summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-06 14:36:50 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-06 14:36:50 +0900
commit81b6a801f79f3caddf4257a014a6aa80029c8d62 (patch)
tree9f16c5058e4e05dd4dd5dfa97c83bcbab81a37d3 /SConstruct
parenta31d289de6091987e6b9da6af1b2e56eb79a96fb (diff)
gallium: Update scons instructions. Propagate user environment.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct8
1 files changed, 5 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index 01732b0c52..47f9b5389b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -11,7 +11,7 @@ import sys
#
# For example, invoke scons as
#
-# scons debug=1 dri=0 x86=1
+# scons debug=1 dri=0 machine=x86
#
# to set configuration variables. Or you can write those options to a file
# named config.py:
@@ -19,7 +19,7 @@ import sys
# # config.py
# debug=1
# dri=0
-# x86=1
+# machine='x86'
#
# Invoke
#
@@ -35,7 +35,9 @@ opts.Add(BoolOption('dri', 'build dri drivers', False))
opts.Add(EnumOption('machine', 'use machine-specific assembly code', 'x86',
allowed_values=('generic', 'x86', 'x86-64')))
-env = Environment(options = opts)
+env = Environment(
+ options = opts,
+ ENV = os.environ)
Help(opts.GenerateHelpText(env))
# for debugging