<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/2d0e7723bd0c5a090727a2c886c324c8c581d666">https://github.com/macports/macports-ports/commit/2d0e7723bd0c5a090727a2c886c324c8c581d666</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 2d0e7723bd0 compiler_wrapper PG: Also disable pipe and isysroot flags when requested
</span>2d0e7723bd0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2d0e7723bd0c5a090727a2c886c324c8c581d666
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri May 7 15:35:35 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> compiler_wrapper PG: Also disable pipe and isysroot flags when requested
</span>---
_resources/port1.0/group/compiler_wrapper-1.0.tcl | 25 +++++++++++------------
1 file changed, 12 insertions(+), 13 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 727e0aae837..175314058b4 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;'>@@ -106,9 +106,20 @@ proc compwrap::create_wrapper {tag} {
</span> append comp_opts " [join [option compwrap.compiler_args_forward]]"
append comp_opts " [join [option compwrap.compiler_post_flags]]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add MacPorts compiler flags ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add MP compiler flags ?
</span> if { [option compwrap.add_compiler_flags] } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # standard options
</span> set comp_opts "[compwrap::comp_flags ${tag}] ${comp_opts}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # isysroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.sdkroot] ne "" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![option compiler.limit_flags] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lsearch -exact [option compwrap.ccache_supported_compilers] ${tag}] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set comp_opts "-isysroot[option configure.sdkroot] ${comp_opts}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pipe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option configure.pipe] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set comp_opts "-pipe ${comp_opts}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Add legacy support env vars
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,18 +127,6 @@ proc compwrap::create_wrapper {tag} {
</span> set comp_opts "\$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\} ${comp_opts}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # isysroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.sdkroot] ne "" && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![option compiler.limit_flags] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [lsearch -exact [option compwrap.ccache_supported_compilers] ${tag}] >= 0 } {
</span><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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # pipe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [option configure.pipe] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set comp_opts "-pipe ${comp_opts}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Prepend ccache launcher if active
if { [compwrap::use_ccache ${tag}] } {
set comp "${prefix}/bin/ccache ${comp}"
</pre><pre style='margin:0'>
</pre>