From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 6 Sep 2024 01:36:01 +0000 (+0800)
Subject: Ensure clang++ is autodetected on iOS. (gh-123749)
X-Git-Tag: v3.14.0a1~569
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d359c7c47b7e713cfbf7ba335d96b5f45e0f13e3;p=thirdparty%2FPython%2Fcpython.git

Ensure clang++ is autodetected on iOS. (gh-123749)
---

diff --git a/configure b/configure
index 54982ab2aad9..2e8044819083 100755
--- a/configure
+++ b/configure
@@ -4146,9 +4146,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 32e673e83e52..38582d9987dc 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