Make use of upstream CMake infrastructure to detect the compiler toolchainv5.45.0-rc1v5.45.0

Summary:
Instead of having ad-hoc code for gcc, let CMake do its thing. It has a lot of
logic that we may be interested in, for example it will make the clang switch
much smoother.

Note it raises the minimum cmake to 3.7 for Android, which was released almost
2 years ago.

Test Plan: Built kalgebra on it using kdeorg/android-sdk

Reviewers: #frameworks, #build_system, vkrause

Reviewed By: vkrause

Subscribers: vkrause

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D11776

1 files changed, 2 insertions, 2 deletions

diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in
index 92b1bba2..4eb579b5 100644
--- a/toolchain/deployment-file.json.in
+++ b/toolchain/deployment-file.json.in
@@ -5,7 +5,7 @@
    "toolchain-prefix": "@ANDROID_TOOLCHAIN@",
    "tool-prefix": "@ANDROID_COMPILER_PREFIX@",
    "toolchain-version": "@ANDROID_GCC_VERSION@",
-   "ndk-host": "@_HOST@",
+   "ndk-host": "@_LOWER_CMAKE_HOST_SYSTEM_NAME@-@CMAKE_HOST_SYSTEM_PROCESSOR@",
    "target-architecture": "@ANDROID_ABI@",
    "application-binary": "@EXECUTABLE_DESTINATION_PATH@",
    "qml-root-path": "@CMAKE_SOURCE_DIR@",
@@ -13,7 +13,7 @@
    ##EXTRALIBS##
    ##EXTRAPLUGINS##
    "android-package-source-directory": "@ANDROID_APK_DIR@",
-   "stdcpp-path": "@GNUSTL_SHARED@",
+   "stdcpp-path":##CMAKE_CXX_STANDARD_LIBRARIES##,
    "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@",
    "extraPrefixDirs": [ @EXTRA_PREFIX_DIRS@ ]
 }