<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c602e772fc5e2e8bad6013f79c81ec22b218d753">https://github.com/macports/macports-ports/commit/c602e772fc5e2e8bad6013f79c81ec22b218d753</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c602e772fc5e2e8bad6013f79c81ec22b218d753
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Mar 4 08:35:12 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> rust: use configure.build_arch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See 24a602f.
</span>---
lang/rust/Portfile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/Portfile b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d4c4386226..e3e4e80f879 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +45,9 @@ distname ${name}c-${version}-src
</span>
patchfiles patch-src-librustc-llvm-lib.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append rust-std-${ruststd_version}-${build_arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rustc-${rustc_version}-${build_arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cargo-${cargo_version}-${build_arch}-apple-${os.platform}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles-append rust-std-${ruststd_version}-${configure.build_arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rustc-${rustc_version}-${configure.build_arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo-${cargo_version}-${configure.build_arch}-apple-${os.platform}${extract.suffix}
</span>
checksums ${distname}${extract.suffix} \
rmd160 2fee85c5e52046982a51eff62f64e123f798ed56 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,16 +77,16 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> }
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set rust_root ${worksrcpath}/build/stage0-${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rust_platform ${build_arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_root ${worksrcpath}/build/stage0-${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${configure.build_arch}-apple-${os.platform}
</span> file mkdir ${rust_root}
system "cp -r ${workpath}/rust-std-${ruststd_version}-${rust_platform}/rust-std-${rust_platform}/* ${rust_root}"
system "cp -r ${workpath}/rustc-${rustc_version}-${rust_platform}/rustc/* ${rust_root}"
system "cp -r ${workpath}/cargo-${cargo_version}-${rust_platform}/cargo/* ${rust_root}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set rust_platform ${build_arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set rust_root ${worksrcpath}/build/stage0-${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set rust_platform ${configure.build_arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set rust_root ${worksrcpath}/build/stage0-${configure.build_arch}
</span>
configure.args --enable-vendor \
--default-linker=${configure.cc} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +107,7 @@ post-configure {
</span> xinstall -d -m 0755 ${workpath}/.home/.cargo
set config [open ${workpath}/.home/.cargo/config w]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set rust_platform ${build_arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${configure.build_arch}-apple-${os.platform}
</span> puts ${config} "\[target.${rust_platform}\]"
puts ${config} "linker = \"${configure.cc}\""
</pre><pre style='margin:0'>
</pre>