<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/97af063d25290d1abacd10c3583d5aad0a663569">https://github.com/macports/macports-ports/commit/97af063d25290d1abacd10c3583d5aad0a663569</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 97af063d25290d1abacd10c3583d5aad0a663569
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri May 7 03:34:05 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> compiler_wrapper pg: don't reimplement join (incorrectly)
</span>---
_resources/port1.0/group/compiler_wrapper-1.0.tcl | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 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 4d70f96b721..727e0aae837 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;'>@@ -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 [list]
</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 [list]
</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 [list {\${@}}]
</span>
options compwrap.compilers_to_wrap
default compwrap.compilers_to_wrap [list cc objc cxx objcxx fc f77 f90]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,16 +54,6 @@ proc compwrap::get_ccache_dir {} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc compwrap::trim {c} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove any enclosing "{....}" braces if present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string range [option $c] 0 0 ] eq "\{" &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [string range [option $c] end end] eq "\}" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [string range [option $c] 1 end-1 ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [option $c]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc compwrap::comp_flags {tag} {
switch ${tag} {
cc { set ftag "c" }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +102,9 @@ proc compwrap::create_wrapper {tag} {
</span> file delete -force ${wrapcomp}
# Basic option, to pass on all command line arguments
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>+ set comp_opts [join [option compwrap.compiler_pre_flags]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append comp_opts " [join [option compwrap.compiler_args_forward]]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append comp_opts " [join [option compwrap.compiler_post_flags]]"
</span>
# Add MacPorts compiler flags ?
if { [option compwrap.add_compiler_flags] } {
</pre><pre style='margin:0'>
</pre>