<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/494bdc356140dbd7a00cc8559aa747c8e0a33fa6">https://github.com/macports/macports-ports/commit/494bdc356140dbd7a00cc8559aa747c8e0a33fa6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 494bdc356140dbd7a00cc8559aa747c8e0a33fa6
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Jun 16 12:07:41 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    qmake PG: Use compiler_wrapper PG
</span>---
 _resources/port1.0/group/qmake-1.0.tcl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake-1.0.tcl b/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index de8db7f8937..e0bdab341a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,24 +7,27 @@
</span> 
 PortGroup                       qt4 1.0
 PortGroup                       active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup                       compiler_wrapper 1.0
</span> 
 options qt4.debug_variant
 default qt4.debug_variant yes
 
 pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set cc  [compwrap::wrap_compiler cc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set cxx [compwrap::wrap_compiler cxx]
</span>     configure.cmd                   ${qt_qmake_cmd}
     configure.pre_args-delete       --prefix=${prefix}
     configure.pre_args-append       PREFIX=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    "QMAKE_CC=${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    "QMAKE_CXX=${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    "QMAKE_OBJC=${configure.objc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    "QMAKE_CC=${cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    "QMAKE_CXX=${cxx}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    "QMAKE_OBJC=[compwrap::wrap_compiler objc]" \
</span>                                     "QMAKE_CFLAGS=\"${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]\"" \
                                     "QMAKE_CXXFLAGS=\"${configure.cppflags} ${configure.cxxflags} [get_canonical_archflags cxx]\"" \
                                     "QMAKE_LFLAGS=\"${configure.cppflags} ${configure.ldflags}\"" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    "QMAKE_LINK_C=${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    "QMAKE_LINK_C_SHLIB=${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    "QMAKE_LINK=${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    "QMAKE_LINK_SHLIB=${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    "QMAKE_LINK_C=${cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    "QMAKE_LINK_C_SHLIB=${cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    "QMAKE_LINK=${cxx}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    "QMAKE_LINK_SHLIB=${cxx}"
</span>     configure.universal_args-delete --disable-dependency-tracking
 
     if {[variant_exists universal] && [variant_isset universal]} {
</pre><pre style='margin:0'>

</pre>