<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00319fb22ce028fcd5e973a55a6b9443b44afb8b">https://github.com/macports/macports-ports/commit/00319fb22ce028fcd5e973a55a6b9443b44afb8b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 00319fb22ce028fcd5e973a55a6b9443b44afb8b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat May 14 21:30:37 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> rust PG: fix x86_64 build on 10.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ld64-127 seems to work when building i386 but not x86_64.
</span><span style='display:block; white-space:pre;color:#404040;'> Ensure the use of ld64-274 instead.
</span>---
_resources/port1.0/group/rust-1.0.tcl | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/rust-1.0.tcl b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f9811f587d..8c87356292d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -729,10 +729,9 @@ proc rust::rust_pg_callback {} {
</span> depends_lib-append port:openssl${openssl_ver}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string match "macports-clang*" [option configure.compiler]] && [option os.major] == 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string match "macports-clang*" [option configure.compiler]] && [option os.major] < 11 } {
</span> # by default, ld64 uses ld64-127 when 9 <= ${os.major} < 11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Rust fails to build when ${os.major} >= 10 and ld64 uses ld64-127
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ld64-274 does not seem to build when ${os.major} < 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Rust fails to build when architecture is x86_64 and ld64 uses ld64-127
</span> depends_build-delete port:ld64-274
depends_build-append port:ld64-274
depends_skip_archcheck-delete ld64-274
</pre><pre style='margin:0'>
</pre>