From c3bc8171685b2209b040329438e22f2f146e8682 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 6 Sep 2024 09:36:01 +0800 Subject: [PATCH] Ensure clang++ is autodetected on iOS. (gh-123749) (cherry picked from commit d359c7c47b7e713cfbf7ba335d96b5f45e0f13e3) Co-authored-by: Russell Keith-Magee --- configure | 6 +++--- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 26bb63feacfbcb..687b12d5a48d7d 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 dc76c446aa85b7..525662de5b8a67 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