<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/8ded9ce653386060e9062bc5d3bfc83f8990ee7c">https://github.com/macports/macports-ports/commit/8ded9ce653386060e9062bc5d3bfc83f8990ee7c</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 8ded9ce6533 clang-8.0: Backport fixes for macOS11+ (intel)
</span>8ded9ce6533 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8ded9ce653386060e9062bc5d3bfc83f8990ee7c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Dec 20 11:44:33 2021 +0000

<span style='display:block; white-space:pre;color:#404040;'>    clang-8.0: Backport fixes for macOS11+ (intel)
</span>---
 lang/llvm-8.0/Portfile                             | 16 +++++++++--
 .../files/clang-driver-support-11.x-target.diff    | 31 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-8.0/Portfile b/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df97d585fd3..933010a7160 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,8 +71,8 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>         default_variants    +analyzer
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Not supported on macOS11 and newer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if { ${os.major} > 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Not supported on macOS11 (arm) and newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { ${os.major} > 19 && ${os.arch} eq "arm" } {
</span>         known_fail yes
         pre-fetch {
             ui_error "${subport} is not supported on this macOS release (Darwin ${os.major})."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,6 +200,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span>     # https://github.com/macports/macports-base/pull/179
     patchfiles-append patch-libcxx-includes-config-optional-1013.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Understand deployment target of 11.x on Big Sur
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://trac.macports.org/ticket/61525
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append clang-driver-support-11.x-target.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     # https://llvm.org/bugs/show_bug.cgi?id=25681
     if {${worksrcdir} eq "trunk" || ${worksrcdir} eq "release_${llvm_version_no_dot}"} {
         # Cannot set cppflags due to https://cmake.org/Bug/view.php?id=12928
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,6 +272,14 @@ 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.platform} eq "darwin" && ${os.major} >= 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # prevent compiler_rt from opportunistically trying to build arm64, which fails
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # See:  https://trac.macports.org/ticket/61477
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # and https://github.com/macports/macports-ports/pull/9139
</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-8.0/files/clang-driver-support-11.x-target.diff b/lang/llvm-8.0/files/clang-driver-support-11.x-target.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9b7f5ff9c92
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-8.0/files/clang-driver-support-11.x-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5de7d7132df..48b4e5159f5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tools/clang/lib/Driver/ToolChains/Darwin.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tools/clang/lib/Driver/ToolChains/Darwin.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1759,7 +1759,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (Platform == MacOS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (!Driver::GetReleaseVersion(OSTarget->getOSVersion(), Major, Minor,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    Micro, HadExtra) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        HadExtra || Major != 10 || Minor >= 100 || Micro >= 100)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        HadExtra || Major < 10 || Major >= 100 || Minor >= 100 || Micro >= 100)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       getDriver().Diag(diag::err_drv_invalid_version_number)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           << OSTarget->getAsString(Args, Opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   } else if (Platform == IPhoneOS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/clang/test/Driver/darwin-version.c b/clang/test/Driver/darwin-version.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7885b596462..d823d151eda 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tools/clang/test/Driver/darwin-version.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tools/clang/test/Driver/darwin-version.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,3 +305,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // RUN: %clang -target armv7k-apple-ios10.1-simulator -c %s -### 2>&1 | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // RUN:   FileCheck --check-prefix=CHECK-VERSION-TENV-SIM2 %s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // CHECK-VERSION-TENV-SIM2: "thumbv7k-apple-ios10.1.0-simulator"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// RUN: %clang -target x86_64-apple-macos11 -c %s -### 2>&1 |   \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// RUN:   FileCheck --check-prefix=CHECK-MACOS11 %s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// RUN: %clang -target x86_64-apple-darwin20 -c %s -### 2>&1 |  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// RUN:   FileCheck --check-prefix=CHECK-MACOS11 %s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// RUN: %clang -target x86_64-apple-darwin -mmacos-version-min=11 -c %s -### 2>&1 | \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// RUN:   FileCheck --check-prefix=CHECK-MACOS11 %s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// CHECK-MACOS11: "x86_64-apple-macosx11.0.0"
</span></pre><pre style='margin:0'>

</pre>