<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d5fcf7a7b1f87668c3456c6c151260e326854791">https://github.com/macports/macports-base/commit/d5fcf7a7b1f87668c3456c6c151260e326854791</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d5fcf7a7b1f87668c3456c6c151260e326854791
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Sep 16 05:14:44 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> refine test for which compilers recognize -arch flag
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> To avoid confusion, also distinguish between compilers that
</span><span style='display:block; white-space:pre;color:#404040;'> accept single or multiple -arch.
</span>---
src/port1.0/portconfigure.tcl | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index bac6087..01c5703 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -511,8 +511,17 @@ proc portconfigure::configure_get_universal_ldflags {} {
</span> }
# internal proc to determine if the compiler supports -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portconfigure::arch_flag_supported {compiler} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [regexp {^gcc-4|llvm|apple|clang} $compiler]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portconfigure::arch_flag_supported {compiler {multiple_arch_flags no}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${multiple_arch_flags}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [regexp {^gcc-4|llvm|apple|clang} ${compiler}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GCC prior to 4.7 does not accept -arch flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp {^macports(?:-[^-]+)?-gcc-4\.[0-6]} ${compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
proc portconfigure::compiler_port_name {compiler} {
</pre><pre style='margin:0'>
</pre>