<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/fffff096350d9f303e307ad27ff04b1f95160696">https://github.com/macports/macports-base/commit/fffff096350d9f303e307ad27ff04b1f95160696</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fffff096350d9f303e307ad27ff04b1f95160696
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sat Mar 30 00:35:23 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> Set correct universal and build arch for Apple Silicon Macs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 901eb219812f5b5ae37ef3b95e8c48b00b83d3a5)
</span>---
src/macports1.0/macports.tcl | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index fc05697d..af1e30e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1075,7 +1075,11 @@ match macports.conf.default."
</span>
# Default mp universal options
if {![info exists macports::universal_archs]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$os_major >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$os_major >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::universal_archs {arm64 x86_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$os_major >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::universal_archs {x86_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$os_major >= 10} {
</span> set macports::universal_archs {x86_64 i386}
} else {
set macports::universal_archs {i386 ppc}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1089,7 +1093,13 @@ match macports.conf.default."
</span> # Default arch to build for
if {![info exists macports::build_arch]} {
if {$os_platform eq "darwin"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$os_major >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$os_major >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$os_arch eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::build_arch arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set macports::build_arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$os_major >= 10} {
</span> if {[sysctl hw.cpu64bit_capable] == 1} {
set macports::build_arch x86_64
} else {
</pre><pre style='margin:0'>
</pre>