<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/3dac078e6c6c1b49ff3df55bd32c25f995028292">https://github.com/macports/macports-ports/commit/3dac078e6c6c1b49ff3df55bd32c25f995028292</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 3dac078e6c6 compiler_wrapper PG: Clean up how compiler flag list is created
</span>3dac078e6c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3dac078e6c6c1b49ff3df55bd32c25f995028292
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed May 19 11:14:38 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> compiler_wrapper PG: Clean up how compiler flag list is created
</span>---
_resources/port1.0/group/compiler_wrapper-1.0.tcl | 32 +++++++++--------------
1 file changed, 12 insertions(+), 20 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 0e299297325..dd16beda15f 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;'>@@ -111,51 +111,43 @@ proc compwrap::wrap_compiler {tag} {
</span> xinstall -d ${wrapdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "compiler_wrapper: Creating ${wrapcomp}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp_opts [list]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Some ports append to the compiler path flags, as a hacky means to pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # these to the build. Handle these by manually adding them to the wrapper script.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set csplit [split ${comp} { }]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [llength ${csplit}] > 1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Found compiler flags appended to configure.${tag} : [lrange ${csplit} 1 end]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append comp_opts " [join [lrange ${csplit} 1 end]]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Force recreate in case underlying compiler has changed
file delete -force ${wrapcomp}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "compiler_wrapper: Creating ${wrapcomp}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Basic option, to pass on all command line arguments
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append comp_opts " [join [option compwrap.compiler_pre_flags]]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append comp_opts " [join [option compwrap.compiler_args_forward]]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append comp_opts " [join [option compwrap.compiler_post_flags]]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The list of compiler flags to construct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set comp_opts [list]
</span>
# Add MP compiler flags ?
if { [option compwrap.add_compiler_flags] } {
# standard options
ui_debug "compiler_wrapper: -> Will embed standard compiler flags in ${tag} wrapper script"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp_opts "[compwrap::comp_flags ${tag}] ${comp_opts}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append comp_opts " [compwrap::comp_flags ${tag}]"
</span> # isysroot
if {[option configure.sdkroot] ne "" && \
![option compiler.limit_flags] && \
[lsearch -exact [option compwrap.ccache_supported_compilers] ${tag}] >= 0 } {
ui_debug "compiler_wrapper: -> Will embed SDK isysroot in ${tag} wrapper script"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp_opts "-isysroot[option configure.sdkroot] ${comp_opts}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append comp_opts " -isysroot[option configure.sdkroot]"
</span> }
# pipe
if { [option configure.pipe] } {
ui_debug "compiler_wrapper: -> Will embed -pipe in ${tag} wrapper script"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp_opts "-pipe ${comp_opts}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append comp_opts " -pipe"
</span> }
}
# Add legacy support env vars
if { [option compwrap.add_legacysupport_flags] } {
ui_debug "compiler_wrapper: -> Will embed legacysupport flags in ${tag} wrapper script"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp_opts "\$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\} ${comp_opts}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append comp_opts " \$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\}"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Basic option, to pass on all command line arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Prepend ccache launcher if active
if { [compwrap::use_ccache ${tag}] } {
ui_debug "compiler_wrapper: -> Will use ccache compiler launcher in ${tag} wrapper script"
</pre><pre style='margin:0'>
</pre>