<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/7415707cfd62bd1bd27dbc1327578158dd70b3b0">https://github.com/macports/macports-ports/commit/7415707cfd62bd1bd27dbc1327578158dd70b3b0</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 7415707cfd6 compiler_wrapper PG: refactor methods a little
</span>7415707cfd6 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 7415707cfd62bd1bd27dbc1327578158dd70b3b0
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon May 10 12:23:12 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    compiler_wrapper PG: refactor methods a little
</span>---
 _resources/port1.0/group/compiler_wrapper-1.0.tcl | 15 +++++++++------
 _resources/port1.0/group/janet-1.0.tcl            |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compiler_wrapper-1.0.tcl b/_resources/port1.0/group/compiler_wrapper-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c597bc7879..54700bdbb55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compiler_wrapper-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compiler_wrapper-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,17 +73,20 @@ proc compwrap::comp_flags {tag} {
</span>     return ${flags}
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc compwrap::wrapper_path {tag} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc compwrap::wrapped_command_path {tag origpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Return the path to the wrapper. Format is :-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # <port workpath>/<compiler tag>/<path to underlying compiler>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return [option workpath]/compwrap/${tag}${origpath}
</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;'>+proc compwrap::wrapped_compiler_path {tag} {
</span>     # Get the underlying compiler
     set comp [option configure.${tag}]
     # If not defined, or tag not in list of known compilers to wrap, just return
     if {${comp} eq "" || [lsearch -exact [option compwrap.compilers_to_wrap] ${tag}] < 0} {
         return ${comp}
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Return the path to the wrapper. Format is :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # <port workpath>/<compiler tag>/<path to underlying compiler>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    return [option workpath]/compwrap/${tag}${comp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    return [compwrap::wrapped_command_path ${tag} ${comp}]
</span> }
 
 proc compwrap::wrap_compiler {tag} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +96,7 @@ proc compwrap::wrap_compiler {tag} {
</span>     set comp [option configure.${tag}]
 
     # Get the wrapper
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set wrapcomp [compwrap::wrapper_path ${tag}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set wrapcomp [compwrap::wrapped_compiler_path ${tag}]
</span>     if { ${wrapcomp} eq ${comp} } {
         return ${comp}
     }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/janet-1.0.tcl b/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index fc03bcd3213..394fa42514f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +41,8 @@ pre-build {
</span> default build.cmd               {${prefix}/bin/jpm}
 default build.args              {--verbose
                                  --offline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                 --compiler=[compwrap::wrapper_path cc]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                 --cpp-compiler=[compwrap::wrapper_path cxx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 --compiler=[compwrap::wrapped_compiler_path cc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 --cpp-compiler=[compwrap::wrapped_compiler_path cxx]
</span>                                  --archiver=[janetpg::get_default_ar]
                                  build
                                 }
</pre><pre style='margin:0'>

</pre>