patch from dave flick to tackle a variety of cursor issues

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 51ab08ad8322e272ea427dfe3b15c20dbb80752c..c274ef93bfa695617f2b20e94039d117909817ce 100644 (file)
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import subprocess
 import sys
 
 # Variables for 'waf dist'
-VERSION = '3.0beta4'
+VERSION = '3.0beta4a'
 APPNAME = 'Ardour3'
 
 # Mandatory variables
@@ -128,10 +128,11 @@ def set_compiler_flags (conf,opt):
     platform = u[0].lower()
     version = u[2]
 
+    is_clang = conf.env['CXX'][0].endswith('clang++')
     if opt.gprofile:
         debug_flags = [ '-pg' ]
     else:
-        if platform != 'darwin':
+        if platform != 'darwin' and not is_clang:
             debug_flags = [ '-rdynamic' ] # waf adds -O0 -g itself. thanks waf!
 
     # Autodetect
@@ -214,7 +215,7 @@ def set_compiler_flags (conf,opt):
             elif cpu == "i686":
                 optimization_flags.append ("-march=i686")
 
-        if ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
+        if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
             optimization_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
             debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])