[135018] trunk/dports/multimedia/libvpx/Portfile

[devans at macports.org]

Revision: 135018
          https://trac.macports.org/changeset/135018
Author:   devans at macports.org
Date:     2015-04-13 02:19:33 -0700 (Mon, 13 Apr 2015)
Log Message:
-----------
libvpx: extend use of -fno-integrated-as to clang versions > 602 as well (#47406).

Modified Paths:
--------------
    trunk/dports/multimedia/libvpx/Portfile

Modified: trunk/dports/multimedia/libvpx/Portfile
===================================================================
--- trunk/dports/multimedia/libvpx/Portfile	2015-04-13 09:00:43 UTC (rev 135017)
+++ trunk/dports/multimedia/libvpx/Portfile	2015-04-13 09:19:33 UTC (rev 135018)
@@ -35,7 +35,7 @@
 
 patchfiles          patch-build-make-configure.sh.diff \
                     patch-configure.diff \
-                    patch-Makefile.diff 
+                    patch-Makefile.diff
 
 compiler.blacklist  macports-clang-2.9 macports-clang-3.0 {clang < 421}
 
@@ -73,12 +73,14 @@
 destroot.args       verbose=1
 
 # Build fix for MacPorts clang-3.5 and later:
-# 
+#
 # This is an intentional change to Clang. It now parses the assembly output by default even when emitting assembly so that the diagnostics are consistent between "clang -c" and "clang -S".
 # The solution is either to pass -fno-integrated-as to the compiler, or change the assembly produced (& probably the script that processes it) so that it's valid. Note that commenting out the line won't work: comments get stripped by the same process.
-# Current Xcode versions of clang do not require this fix
-if {[string match "macports-clang-3.\[5-9\]" ${configure.compiler}]} {
-    build.args-append CFLAGS_S=-fno-integrated-as
+# Current Xcode versions of clang > 602 corresponding to Xcode 6.3 or greater also need this fix
+
+if {[string match "macports-clang-3.\[5-9\]" ${configure.compiler}] ||
+    (${configure.compiler} eq "clang" && [compiler_blacklist_versions._get_compiler_version ${configure.compiler}] > 602)} {
+        build.args-append CFLAGS_S=-fno-integrated-as
 }
 
 platform darwin {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150413/f334ae77/attachment.html>