From 5d317930230daf61c72c2fa4bdd7b74dbcd7b190 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Jun 2017 08:27:34 -0400 Subject: Android: Fix include path for unified headers In commit v3.9.0-rc3~3^2 (Android: Add support for unified headers, 2017-06-12) we accidentally constructed the unified header include directories from the linking sysroot. Construct them from the compiling sysroot instead. Fixes: #16584 --- Modules/Platform/Android-Common.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Modules/Platform/Android-Common.cmake b/Modules/Platform/Android-Common.cmake index ac72676006..6360376a5b 100644 --- a/Modules/Platform/Android-Common.cmake +++ b/Modules/Platform/Android-Common.cmake @@ -160,9 +160,13 @@ macro(__android_compiler_common lang) # Do not do this for a standalone toolchain because it is already # tied to a specific API version. if(CMAKE_ANDROID_NDK) - list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/usr/include") if(NOT CMAKE_ANDROID_NDK_DEPRECATED_HEADERS) - list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/usr/include/${CMAKE_ANDROID_ARCH_HEADER_TRIPLE}") + list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES + "${CMAKE_SYSROOT_COMPILE}/usr/include" + "${CMAKE_SYSROOT_COMPILE}/usr/include/${CMAKE_ANDROID_ARCH_HEADER_TRIPLE}" + ) + else() + list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/usr/include") endif() list(REMOVE_ITEM CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES "/usr/include") endif() -- cgit v1.2.1