<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/32cac742f9428423cce64f74cd71bbfbf9672441">https://github.com/macports/macports-ports/commit/32cac742f9428423cce64f74cd71bbfbf9672441</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 32cac742f94 clang-10: re-enable cmake clang-rt config
</span>32cac742f94 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 32cac742f9428423cce64f74cd71bbfbf9672441
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Jan 16 12:52:40 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> clang-10: re-enable cmake clang-rt config
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> clang-10's clang-rt had troubles sorting out the
</span><span style='display:block; white-space:pre;color:#404040;'> archs supported and buildable by the OS once
</span><span style='display:block; white-space:pre;color:#404040;'> arm came along, so it was overridden to allow
</span><span style='display:block; white-space:pre;color:#404040;'> building on Xcode12 supporting systems.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The key patch from upstream was backported from
</span><span style='display:block; white-space:pre;color:#404040;'> clang-11 to allow this to work as designed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This simplifies the clang-10 port somewhat, and enables
</span><span style='display:block; white-space:pre;color:#404040;'> arm64 support in compiler-rt as well.
</span>---
lang/llvm-10/Portfile | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-10/Portfile b/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d8b4e0a1738..7840a9dcf2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ set clang_executable_version 10
</span> set lldb_executable_version 10
name llvm-${llvm_version}
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 3 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 4 }
</span> subport lldb-${llvm_version} { revision 1 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,14 +208,6 @@ configure.args-append \
</span> -DFFI_INCLUDE_DIR=`pkg-config --cflags-only-I libffi | sed 's/-I//'` \
-DFFI_LIBRARY_DIR=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} >= 19 && ${build_arch} ne "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO - see if this is still valid now that the arm compiler-rt patch has been added
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # prevent compiler_rt from opportunistically trying to build arm64, which fails
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://trac.macports.org/ticket/61477
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and https://github.com/macports/macports-ports/pull/9139
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DDARWIN_osx_ARCHS="x86_64\;x86_64h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq "llvm-${llvm_version}"} {
select.group llvm
select.file ${filespath}/mp-${subport}
</pre><pre style='margin:0'>
</pre>