[143449] trunk/dports/_resources/port1.0/group/python-1.0.tcl

[mcalhoun at macports.org]

Revision: 143449
          https://trac.macports.org/changeset/143449
Author:   mcalhoun at macports.org
Date:     2015-12-12 09:46:24 -0800 (Sat, 12 Dec 2015)
Log Message:
-----------
python-1.0.tcl: destroot.env should be modified in pre-destroot instead of pre-build (#49948)

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

Modified: trunk/dports/_resources/port1.0/group/python-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python-1.0.tcl	2015-12-12 17:41:13 UTC (rev 143448)
+++ trunk/dports/_resources/port1.0/group/python-1.0.tcl	2015-12-12 17:46:24 UTC (rev 143449)
@@ -127,10 +127,6 @@
                                         OBJCFLAGS="${configure.universal_cflags}" \
                                         CXXFLAGS="${configure.universal_cxxflags}" \
                                         LDFLAGS="${configure.universal_ldflags}"
-                    destroot.env-append CFLAGS="${configure.universal_cflags}" \
-                                        OBJCFLAGS="${configure.universal_cflags}" \
-                                        CXXFLAGS="${configure.universal_cxxflags}" \
-                                        LDFLAGS="${configure.universal_ldflags}"
                 } else {
                     build.env-append    CFLAGS="${configure.cc_archflags}" \
                                         OBJCFLAGS="${configure.objc_archflags}" \
@@ -139,6 +135,24 @@
                                         F90FLAGS="${configure.f90_archflags}" \
                                         FCFLAGS="${configure.fc_archflags}" \
                                         LDFLAGS="${configure.ld_archflags}"
+                }
+            }
+            if {${python.set_compiler}} {
+                foreach var {cc objc cxx fc f77 f90} {
+                    if {[set configure.${var}] ne ""} {
+                        build.env-append [string toupper $var]="[set configure.${var}]"
+                    }
+                }
+            }
+        }
+        pre-destroot {
+            if {${python.add_archflags}} {
+                if {[variant_exists universal] && [variant_isset universal]} {
+                    destroot.env-append CFLAGS="${configure.universal_cflags}" \
+                                        OBJCFLAGS="${configure.universal_cflags}" \
+                                        CXXFLAGS="${configure.universal_cxxflags}" \
+                                        LDFLAGS="${configure.universal_ldflags}"
+                } else {
                     destroot.env-append CFLAGS="${configure.cc_archflags}" \
                                         OBJCFLAGS="${configure.objc_archflags}" \
                                         CXXFLAGS="${configure.cxx_archflags}" \
@@ -151,7 +165,6 @@
             if {${python.set_compiler}} {
                 foreach var {cc objc cxx fc f77 f90} {
                     if {[set configure.${var}] ne ""} {
-                        build.env-append [string toupper $var]="[set configure.${var}]"
                         destroot.env-append [string toupper $var]="[set configure.${var}]"
                     }
                 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/2e9c95df/attachment-0001.html>