<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aad6d7d9fbf29ca3da15a0310f457e72d083e8a1">https://github.com/macports/macports-ports/commit/aad6d7d9fbf29ca3da15a0310f457e72d083e8a1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aad6d7d9fbf29ca3da15a0310f457e72d083e8a1
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Sep 3 22:55:18 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> mrustc: enable support of GCC
</span>---
lang/mrustc/Portfile | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/Portfile b/lang/mrustc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c327f59fc40..0988cba889d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,9 +47,8 @@ compiler.cxx_standard 2014
</span> compiler.c_standard 2011
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# GCC can't be used as a run-time compiler, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/thepowersgang/mrustc/issues/214
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Officially tested with GCC 5.4+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist *gcc-3.* *gcc-4.*
</span>
# See https://github.com/thepowersgang/mrustc/issues/255
compiler.blacklist-append {clang < 1300} {macports-clang-3.[0-9]} macports-clang-4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,12 +60,19 @@ if { [string match macports-clang-* ${configure.compiler}] } {
</span> depends_run-append \
port:[string map {"macports-" ""} ${configure.compiler}]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string match macports-gcc-* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:[string map {"macports-gcc-" "gcc"} ${configure.compiler}]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Uncomment the lines below and delete the line above when GCC support is fixed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if { [string match macports-gcc-* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:[string map {"macports-gcc-" "gcc"} ${configure.compiler}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GCC is required to be linked with libatomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://github.com/thepowersgang/mrustc/issues/214
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set script [open "${worksrcpath}/script-overrides/stable-${rust_version}-macos/build_libc.txt" a]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "cargo:rustc-link-lib=atomic"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${script}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-extract {
# prevent it from re-download sources
</pre><pre style='margin:0'>
</pre>