<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/8b5f0ac53e7ab57181d52cfd100a5c7dfc8cac09">https://github.com/macports/macports-ports/commit/8b5f0ac53e7ab57181d52cfd100a5c7dfc8cac09</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 8b5f0ac53e7 golang PG: Strip -static from wrapped compiler options
</span>8b5f0ac53e7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8b5f0ac53e7ab57181d52cfd100a5c7dfc8cac09
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Apr 17 11:55:03 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> golang PG: Strip -static from wrapped compiler options
</span>---
_resources/port1.0/group/golang-1.0.tcl | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
<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 04dc51943da..c1951c52e08 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;'>@@ -169,16 +169,15 @@ proc go.append_env {} {
</span> # legacy macOS support, are correctly passed.
if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
# Create a wrapper script around CC,CXX command to enforce use of flags required for legacy support
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note, go annoying uses CC for both building and linking, and thus in order to get it to correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note, go annoyingly uses CC for both building and linking, and thus in order to get it to correctly
</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.
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set l_lib [legacysupport::get_library_name]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '#!/bin/bash' > ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'exec ${configure.cc} ${configure.cflags} ${configure.ldflags} \"\$\{\@\}\"' -Wno-error >> ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo '#!/bin/bash' > ${workpath}/go_cc_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'exec ${configure.cc} ${configure.cflags} ${configure.ldflags} \"\$\{\@\//-static/\}\"' -Wno-error >> ${workpath}/go_cc_wrap"
</span> system "chmod +x ${workpath}/go_cc_wrap"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '#!/bin/bash' > ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'exec ${configure.cxx} ${configure.cxxflags} ${configure.ldflags} \"\$\{\@\}\"' -Wno-error >> ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo '#!/bin/bash' > ${workpath}/go_cxx_wrap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'exec ${configure.cxx} ${configure.cxxflags} ${configure.ldflags} \"\$\{\@\//-static/\}\"' -Wno-error >> ${workpath}/go_cxx_wrap"
</span> system "chmod +x ${workpath}/go_cxx_wrap"
}
build.env-append "GO_EXTLINK_ENABLED=1" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,8 +188,8 @@ proc go.append_env {} {
</span> "CXX=${workpath}/go_cxx_wrap"
configure.env-append ${build.env}
test.env-append ${build.env}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Set Build/Test Env ${build.env}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Set Build/Test Env ${build.env}"
</span> }
port::register_callback go.append_env
</pre><pre style='margin:0'>
</pre>