<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/de3b2c09de90fdb69c5bdc1ba14444d9e92c2eba">https://github.com/macports/macports-ports/commit/de3b2c09de90fdb69c5bdc1ba14444d9e92c2eba</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 de3b2c09de9 clang-{9.0,10}: Fix (x86_64) Darwin20 builds Closes: https://trac.macports.org/ticket/61477
</span>de3b2c09de9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit de3b2c09de90fdb69c5bdc1ba14444d9e92c2eba
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Nov 17 03:09:41 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> clang-{9.0,10}: Fix (x86_64) Darwin20 builds
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61477
</span>---
lang/llvm-10/Portfile | 14 ++++++++++++++
lang/llvm-9.0/Portfile | 14 ++++++++++++++
2 files changed, 28 insertions(+)
<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 5bd36ebe6c2..71f0253a060 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;'>@@ -202,6 +202,20 @@ 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:#e0ffe0;'>+if { ${os.major} > 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On macOS11 the macOS 11.0 SDK has support for Apple Silicon, which causes LLVM to,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if left to its own devices, enable support for arm64 which then fails to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To prevent this manually set the supported ARCH list.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/61477
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and discussion at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-ports/pull/9139
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note this version of clang is highly unlikely to ever support macOS11+ on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Apple Silicon. For that hardware a newer clang (11) will need to be used instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DDARWIN_osx_ARCHS="x86_64\;x86_64h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq "llvm-${llvm_version}"} {
select.group llvm
select.file ${filespath}/mp-${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-9.0/Portfile b/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fb42acf7f4..8f9114094ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,6 +263,20 @@ 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:#e0ffe0;'>+if { ${os.major} > 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On macOS11 the macOS 11.0 SDK has support for Apple Silicon, which causes LLVM to,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if left to its own devices, enable support for arm64 which then fails to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To prevent this manually set the supported ARCH list.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/61477
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and discussion at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-ports/pull/9139
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note this version of clang is highly unlikely to ever support macOS11+ on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Apple Silicon. For that hardware a newer clang (11) will need to be used instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DDARWIN_osx_ARCHS="x86_64\;x86_64h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq "llvm-${llvm_version}"} {
select.group llvm
select.file ${filespath}/mp-${subport}
</pre><pre style='margin:0'>
</pre>