<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1bfc331c7ce772203415172ea799fe41d271c1c0">https://github.com/macports/macports-ports/commit/1bfc331c7ce772203415172ea799fe41d271c1c0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 1bfc331  gobject_introspection-1.0.tcl: Also set CC at destroot time
</span>1bfc331 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 1bfc331c7ce772203415172ea799fe41d271c1c0
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 22 18:23:16 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    gobject_introspection-1.0.tcl: Also set CC at destroot time
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This is a follow-up to 73614158cd17e741705f3d6e721921bb6fc65c5f
</span><span style='display:block; white-space:pre;color:#404040;'>    which never worked.
</span>---
 .../port1.0/group/gobject_introspection-1.0.tcl    | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gobject_introspection-1.0.tcl b/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c004287..9e33ed8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,8 +78,7 @@ pre-build {
</span>         if {[info exists universal_archs_to_use]} {
             global merger_build_args
             foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                lappend merger_build_args(${arch})     CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                lappend merger_destroot_args(${arch})  CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                lappend merger_build_args(${arch})      CC='${configure.cc} -arch ${arch}'
</span>             }
         } else {
             # This deliberately does not use [get_canonical_archflags cc]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,8 +96,7 @@ pre-build {
</span>             #
             # The non-g-ir-scanner parts of the build are assumed to build with
             # the correct -arch flags as determined at configure time.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            build.args-append      CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            destroot.args-append   CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
</span>         }
 
         # The rules enabled by gobject-introspection require GNU make 3.81+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,3 +105,19 @@ pre-build {
</span>         }
     }
 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${gobject_introspection}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # gobject-introspection uses g-ir-scanner, which uses $CC from args.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[info exists universal_archs_to_use]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            global merger_destroot_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                lappend merger_destroot_args(${arch})   CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # This deliberately does not use [get_canonical_archflags cc]. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # explanation in pre-build block.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>

</pre>