[48675] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[mcalhoun at macports.org]

Revision: 48675
          http://trac.macports.org/changeset/48675
Author:   mcalhoun at macports.org
Date:     2009-03-26 18:58:00 -0700 (Thu, 26 Mar 2009)
Log Message:
-----------
muniversal-1.0.tcl: Allow configure compilers to remain unchanged.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-03-27 01:52:31 UTC (rev 48674)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-03-27 01:58:00 UTC (rev 48675)
@@ -42,6 +42,7 @@
 #    merger_configure_cxxflags: associative array of configure.cxxflags
 #     merger_configure_ldflags: associative array of configure.ldflags
 #             merger_arch_flag: if no, -arch xxx will not be appended configure.???flags
+#         merger_arch_compiler: if no, -arch xxx will not be appended to compilers
 #          merger_destroot_env: assoicative array of desroot.env variables
 #             merger_dont_diff: list of file names for which diff will not work
 #     merger_must_run_binaries: if yes, build platform must be able to run binaries for supported architectures
@@ -79,6 +80,10 @@
         set merger_arch_flag "yes"
 }
 
+if { ! [info exists merger_arch_compiler ] } {
+        set merger_arch_compiler "yes"
+}
+
 variant universal {
     global universal_archs_to_use
 
@@ -215,8 +220,10 @@
             set configure_cc_save   ${configure.cc}
             set configure_cxx_save  ${configure.cxx}
 
-            configure.cc   ${configure.cc}  ${archf}
-            configure.cxx  ${configure.cxx} ${archf}
+            if { ${merger_arch_compiler} != "no" } {
+                configure.cc   ${configure.cc}  ${archf}
+                configure.cxx  ${configure.cxx} ${archf}
+            }
 
             set configure_dir_save  ${configure.dir}
             if { [string match "${worksrcpath}/*" ${configure.dir}] } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090326/fb7fd5f3/attachment-0001.html>