diff options
| author | Ben Skeggs <[email protected]> | 2008-05-05 19:44:16 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-05-05 19:44:16 +1000 |
| commit | 33d9e213ee47aab32f662caf3e7c07c2697befbe (patch) | |
| tree | 20fd91d378d396e8e2ace51ee23722d98f212fcc /common.py | |
| parent | 1e6191e0af2653aa69bd623e25d2e157662e560f (diff) | |
| parent | 736f535b4f1c5e6912b5b2fe9415a3b44a678844 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'common.py')
| -rw-r--r-- | common.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/common.py b/common.py index 1c939e0e245..6de181739ba 100644 --- a/common.py +++ b/common.py @@ -44,8 +44,14 @@ else: # Common options def AddOptions(opts): - from SCons.Options.BoolOption import BoolOption - from SCons.Options.EnumOption import EnumOption + try: + from SCons.Options.BoolOption import BoolOption + except ImportError: + from SCons.Variables.BoolVariable import BoolVariable as BoolOption + try: + from SCons.Options.EnumOption import EnumOption + except ImportError: + from SCons.Variables.EnumVariable import EnumVariable as EnumOption opts.Add(BoolOption('debug', 'build debug version', 'no')) #opts.Add(BoolOption('quiet', 'quiet command lines', 'no')) opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine, |