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

diff --git a/configure b/configure
index 54982ab2aad9aa95d2d8125512927d0ec38faaf6..2e8044819083f3d8720129539f5455ca19e776b1 100755 (executable)
--- 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 32e673e83e52d5b59bc0d1c0714d4cf1f216a2a4..38582d9987dc28ed2448adbdd79451fdd9f39856 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