From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 21 Apr 2015 17:01:54 +0000 (-0400)
Subject: use compiler target to determine whether to use 64 bit windows assembler, not the... 
X-Git-Tag: 4.1~407
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=8c52662ac0719d9ef40572430abd8e7d392e6464;p=ardour.git

use compiler target to determine whether to use 64 bit windows assembler, not the build host CPU type
---

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 947ba0fbe2..ac5dc18503 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -409,11 +409,11 @@ def build(bld):
         elif bld.env['build_target'] == 'x86_64':
             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit.s' ]
         elif bld.env['build_target'] == 'mingw':
-                import platform as PLATFORM
-                u = PLATFORM.uname ()
-                cpu = u[4]
-                if re.search ("(x86_64|AMD64)", cpu) != None:
-                        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit_win.s' ]
+	        # usability of the 64 bit windows assembler depends on the compiler target,
+	        # not the build host, which in turn can only be inferred from the name
+	        # of the compiler. 
+	        if re.search ('/x86_64/', str(conf.env['CC'])):
+		        obj.source += [ 'sse_functions_xmm.cc', 'sse_functions_64bit_win.s' ]
 
     # i18n
     if bld.is_defined('ENABLE_NLS'):