[compiler-rt] r273957 - [CMake] Check for androidabi in CMakeLists.txt not base-config-ix.cmake

[Evgenii Stepanov via llvm-commits]

Thanks!

On Mon, Jun 27, 2016 at 3:52 PM, Chris Bieneman via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: cbieneman
> Date: Mon Jun 27 17:52:05 2016
> New Revision: 273957
>
> URL: http://llvm.org/viewvc/llvm-project?rev=273957&view=rev
> Log:
> [CMake] Check for androidabi in CMakeLists.txt not base-config-ix.cmake
>
> COMPILER_RT_DEFAULT_TARGET_ABI is not set in base-config-ix.cmake, so we need to move this check into CMakeLists.txt.
>
> Modified:
>     compiler-rt/trunk/CMakeLists.txt
>     compiler-rt/trunk/cmake/base-config-ix.cmake
>
> Modified: compiler-rt/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=273957&r1=273956&r2=273957&view=diff
> ==============================================================================
> --- compiler-rt/trunk/CMakeLists.txt (original)
> +++ compiler-rt/trunk/CMakeLists.txt Mon Jun 27 17:52:05 2016
> @@ -105,6 +105,9 @@ if(NOT COMPILER_RT_DEFAULT_TARGET_TRIPLE
>  else()
>    set(COMPILER_RT_HAS_EXPLICIT_DEFAULT_TARGET_TRIPLE FALSE)
>  endif()
> +if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi")
> +  set(ANDROID 1)
> +endif()
>  include(CompilerRTUtils)
>
>  set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
>
> Modified: compiler-rt/trunk/cmake/base-config-ix.cmake
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/base-config-ix.cmake?rev=273957&r1=273956&r2=273957&view=diff
> ==============================================================================
> --- compiler-rt/trunk/cmake/base-config-ix.cmake (original)
> +++ compiler-rt/trunk/cmake/base-config-ix.cmake Mon Jun 27 17:52:05 2016
> @@ -61,10 +61,6 @@ else()
>    set(COMPILER_RT_TEST_COMPILER_ID GNU)
>  endif()
>
> -if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi")
> -  set(ANDROID 1)
> -endif()
> -
>  string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR)
>  set(COMPILER_RT_LIBRARY_OUTPUT_DIR
>    ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR})
> @@ -118,7 +114,6 @@ macro(test_targets)
>    if(ANDROID)
>      # Examine compiler output to determine target architecture.
>      detect_target_arch()
> -    set(COMPILER_RT_OS_SUFFIX "-android")
>    elseif(NOT APPLE) # Supported archs for Apple platforms are generated later
>      if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64")
>        if(NOT MSVC)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits