X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=common.py;h=f7dbe55aa8a3c47bbb7dc2d903c978ead6a2ecf8;hb=cc2f337d06987ea7a8fbf30ce33330b4d993207c;hp=dd64e0f434de0c6e9b8475cc174f95db43e0aa4e;hpb=7513bc3886b69335e7976b2c9bbde8e928485818;p=mesa.git

diff --git a/common.py b/common.py
index dd64e0f434d..f7dbe55aa8a 100644
--- a/common.py
+++ b/common.py
@@ -3,6 +3,8 @@
 
 import os
 import os.path
+import re
+import subprocess
 import sys
 import platform as _platform
 
@@ -12,7 +14,7 @@ import platform as _platform
 
 _platform_map = {
 	'linux2': 'linux',
-	'win32': 'winddk',
+	'win32': 'windows',
 }
 
 default_platform = sys.platform
@@ -24,17 +26,44 @@ _machine_map = {
 	'i486': 'x86',
 	'i586': 'x86',
 	'i686': 'x86',
+	'ppc' : 'ppc',
 	'x86_64': 'x86_64',
 }
+
+
+# find default_machine value
 if 'PROCESSOR_ARCHITECTURE' in os.environ:
 	default_machine = os.environ['PROCESSOR_ARCHITECTURE']
 else:
 	default_machine = _platform.machine()
 default_machine = _machine_map.get(default_machine, 'generic')
 
-if default_platform in ('linux', 'freebsd', 'darwin'):
+
+# find default_llvm value
+if 'LLVM' in os.environ:
+    default_llvm = 'yes'
+else:
+    # Search sys.argv[] for a "platform=foo" argument since we don't have
+    # an 'env' variable at this point.
+    platform = default_platform
+    pattern = re.compile("(platform=)(.*)")
+    for arg in sys.argv:
+        m = pattern.match(arg)
+        if m:
+            platform = m.group(2)
+
+    default_llvm = 'no'
+    try:
+        if platform != 'windows' and subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
+            default_llvm = 'yes'
+    except:
+        pass
+
+
+# find default_dri value
+if default_platform in ('linux', 'freebsd'):
 	default_dri = 'yes'
-elif default_platform in ('winddk', 'windows', 'wince'):
+elif default_platform in ('winddk', 'windows', 'wince', 'darwin'):
 	default_dri = 'no'
 else:
 	default_dri = 'no'
@@ -45,20 +74,20 @@ else:
 
 def AddOptions(opts):
 	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.Options.BoolOption import BoolOption
+	try:
 		from SCons.Variables.EnumVariable import EnumVariable as EnumOption
-	opts.Add(BoolOption('debug', 'debug build', 'no'))
+	except ImportError:
+		from SCons.Options.EnumOption import EnumOption
+	opts.Add(BoolOption('debug', 'debug build', 'yes'))
 	opts.Add(BoolOption('profile', 'profile build', 'no'))
-	#opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))
+	opts.Add(BoolOption('quiet', 'quiet command lines', 'yes'))
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
-											 allowed_values=('generic', 'x86', 'x86_64')))
+											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
 	opts.Add(EnumOption('platform', 'target platform', default_platform,
-											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince')))
-	opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
+											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded', 'cygwin')))
+	opts.Add('toolchain', 'compiler toolchain', 'default')
+	opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
 	opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))
-