aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2019-09-13 14:57:49 -0700
committerDan Albert <danalbert@google.com>2019-09-13 15:02:37 -0700
commite286eb64da3235bd0ccd54600cb14a7fc681eab9 (patch)
treeef13ada1b867d3447a106c8e455080e6147ee643 /build
parent2d5bce02b7f30b0637d0e57c38132fce6d1ee4f4 (diff)
downloadndk-e286eb64da3235bd0ccd54600cb14a7fc681eab9.tar.gz
Set additional CMake compiler variable.
CMake 3.15 added this, and we need to set it since we don't use the CMake compiler detection. Test: ./checkbuild.py && ./run_tests.py Bug: https://github.com/android/ndk/issues/1049 Change-Id: I6ecae2919d0e1d8db26822bc91a674c70e353128
Diffstat (limited to 'build')
-rw-r--r--build/cmake/android.toolchain.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake
index 5a265dc18..8f83972e8 100644
--- a/build/cmake/android.toolchain.cmake
+++ b/build/cmake/android.toolchain.cmake
@@ -430,6 +430,8 @@ set(CMAKE_CXX_COMPILER_VERSION 8.0)
set(CMAKE_C_STANDARD_COMPUTED_DEFAULT 11)
set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT 14)
set(CMAKE_C_COMPILER_TARGET ${ANDROID_LLVM_TRIPLE})
+set(CMAKE_C_COMPILER_FRONTEND_VARIANT "GNU")
+set(CMAKE_CXX_COMPILER_FRONTEND_VARIANT "GNU")
set(CMAKE_CXX_COMPILER_TARGET ${ANDROID_LLVM_TRIPLE})
set(CMAKE_ASM_COMPILER_TARGET ${ANDROID_LLVM_TRIPLE})
set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${ANDROID_TOOLCHAIN_ROOT}")