<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/8f33bcb1860575d4bd6e0d1b0094f36cde0d5891">https://github.com/macports/macports-ports/commit/8f33bcb1860575d4bd6e0d1b0094f36cde0d5891</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8f33bcb1860575d4bd6e0d1b0094f36cde0d5891
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Jun 13 11:42:44 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> compiler_wrapper PG: Fix reading of configure.Xflags
</span>---
_resources/port1.0/group/compiler_wrapper-1.0.tcl | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 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 7c087a2c519..8f1d251a43e 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;'>@@ -67,9 +67,10 @@ proc compwrap::comp_flags {tag} {
</span> [catch {get_canonical_archflags ${tag}} flags] } {
set flags [join ""]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.${ftag}flags
</span> if { [info exists configure.${ftag}flags] } {
append flags " [join [option configure.${ftag}flags]]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> return ${flags}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,14 +122,16 @@ proc compwrap::wrap_compiler {tag} {
</span> # Add MP compiler flags ?
if { [option compwrap.add_compiler_flags] } {
# standard options
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "compiler_wrapper: -> Will embed standard compiler flags in ${tag} wrapper script"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append comp_opts " [compwrap::comp_flags ${tag}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set flag [compwrap::comp_flags ${tag}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "compiler_wrapper: -> Will embed '${flag}' in ${tag} wrapper script"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append comp_opts " ${flag}"
</span> # isysroot
if {[option configure.sdkroot] ne "" && \
![option compiler.limit_flags] && \
[lsearch -exact [option compwrap.ccache_supported_compilers] ${tag}] >= 0 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "compiler_wrapper: -> Will embed SDK isysroot in ${tag} wrapper script"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append comp_opts " -isysroot[option configure.sdkroot]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk -isysroot[option configure.sdkroot]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "compiler_wrapper: -> Will embed '${sdk}' in ${tag} wrapper script"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append comp_opts " ${sdk}"
</span> }
# pipe
if { [option configure.pipe] } {
</pre><pre style='margin:0'>
</pre>