<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/884f36646f82c8e85f3c9ebf9af0765ad643fb4e">https://github.com/macports/macports-ports/commit/884f36646f82c8e85f3c9ebf9af0765ad643fb4e</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 884f36646f8 compilerwrapper,golang: Fix issues with string options
</span>884f36646f8 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 884f36646f82c8e85f3c9ebf9af0765ad643fb4e
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue May 4 16:16:36 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    compilerwrapper,golang: Fix issues with string options
</span>---
 _resources/port1.0/group/compilerwrapper-1.0.tcl | 17 +++++++++++++----
 _resources/port1.0/group/golang-1.0.tcl          |  6 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilerwrapper-1.0.tcl b/_resources/port1.0/group/compilerwrapper-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 05350dcbce6..f0539a88671 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilerwrapper-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilerwrapper-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,13 +17,13 @@ options compwrap.print_compiler_command
</span> default compwrap.print_compiler_command no
 
 options compwrap.compiler_pre_flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default compwrap.compiler_pre_flags ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compwrap.compiler_pre_flags {{}}
</span> 
 options compwrap.compiler_post_flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default compwrap.compiler_post_flags ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compwrap.compiler_post_flags {{}}
</span> 
 options compwrap.compiler_args_forward
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default compwrap.compiler_args_forward {\$\{\@\}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compwrap.compiler_args_forward {{\$\{\@\}}}
</span> 
 proc compwrap::use_ccache {tag} {
     global prefix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,14 @@ proc compwrap::known_fortran_compiler_tags {} {
</span>     return [list fc f77 f90]
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc compwrap::trim {c} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { [string range [option $c] 0 0] eq "\{" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return [string range [option $c] 1 end-1 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return [option $c]
</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> proc compwrap::create_wrapper {tag} {
     global prefix
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +84,8 @@ proc compwrap::create_wrapper {tag} {
</span>     file delete -force ${fname}
 
     # Basic option, to pass on all command line arguments
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set comp_opts "[option compwrap.compiler_pre_flags] [option compwrap.compiler_args_forward] [option compwrap.compiler_post_flags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set comp_opts "[trim compwrap.compiler_pre_flags] [trim compwrap.compiler_args_forward] [trim compwrap.compiler_post_flags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ui_msg ${comp_opts}
</span>     # Add MacPorts compiler flags ?
     if { [option compwrap.add_compiler_flags] } {
         set comp_opts "[option configure.${ftag}flags] [get_canonical_archflags ${tag}] ${comp_opts}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/golang-1.0.tcl b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5de74a71f4f..00fed66d1d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/golang-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,9 +177,9 @@ proc go.append_env {} {
</span>         # link to the legacy support library, the ldflags need to be added to the cc and ccx wrappers.
         # To then prevent 'clang linker input unused' errors we must append -Wno-error at the end.
         # Also remove '-static' from compilation options as this is not supported on older systems.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        #compwrap.compiler_args_forward {\$\{\@\//-static/\}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        #compwrap.compiler_pre_flags    " ${configure.ldflags} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        #compwrap.compiler_post_flags   { -Wno-error }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        compwrap.compiler_args_forward \$\{\@\//-static/\}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        compwrap.compiler_pre_flags    ${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        compwrap.compiler_post_flags   -Wno-error
</span>     #}
     post-extract {
         build.env-append \
</pre><pre style='margin:0'>

</pre>