From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 6 Sep 2024 02:13:27 +0000 (+0200)
Subject: [3.13] Ensure clang++ is autodetected on iOS. (gh-123749) (#123758)
X-Git-Tag: v3.13.0rc2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ed77c1afc125035996d85d77919351ae0f0d862;p=thirdparty%2FPython%2Fcpython.git

[3.13] Ensure clang++ is autodetected on iOS. (gh-123749) (#123758)

Ensure clang++ is autodetected on iOS. (gh-123749)
(cherry picked from commit d359c7c47b7e713cfbf7ba335d96b5f45e0f13e3)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
---

diff --git a/configure b/configure
index 26bb63feacfb..687b12d5a48d 100755
--- a/configure
+++ b/configure
@@ -4144,9 +4144,9 @@ if test -z "$CPP"; then
 fi
 if test -z "$CXX"; then
 	case "$host" in
-		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang ;;
-		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang ;;
-		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang ;;
+		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
 		*)
 	esac
 fi
diff --git a/configure.ac b/configure.ac
index dc76c446aa85..525662de5b8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,9 +418,9 @@ if test -z "$CPP"; then
 fi
 if test -z "$CXX"; then
 	case "$host" in
-		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang ;;
-		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang ;;
-		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang ;;
+		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
 		*)
 	esac
 fi