[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 26bb63feacfbcb90a7e996adce889e972b8684e5..687b12d5a48d7dc850de9361c17638c30b2a5a8f 100755 (executable)
--- 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 dc76c446aa85b710e93c5fce283b7e1ad59e2b18..525662de5b8a671df2f48baac17d79f34708ed3c 100644 (file)
--- 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