This is an archive of the discontinued LLVM Phabricator instance.

Paths

Set ANDROID when any android abi is used, not just androideabi
ClosedPublic

Authored by fjricci on Sep 19 2017, 10:27 AM.

Reviewers

compnerd
beanz

Commits

Build Status

Buildable 10420
Build 10420: arc lint + arc unit

Android aarch64 nor x86 use androideabi, so this makes more sense.

This revision is now accepted and ready to land.Sep 19 2017, 10:32 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

2 lines

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines	if (COMPILER_RT_STANDALONE_BUILD)
set(LIT_ARGS_DEFAULT "-sv")		set(LIT_ARGS_DEFAULT "-sv")
if (MSVC OR XCODE)		if (MSVC OR XCODE)
set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")		set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")
endif()		endif()
set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")		set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")
endif()		endif()

construct_compiler_rt_default_triple()		construct_compiler_rt_default_triple()
if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi")		if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" MATCHES "^android")
set(ANDROID 1)		set(ANDROID 1)
endif()		endif()
if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" MATCHES "hf$")		if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" MATCHES "hf$")
if (${COMPILER_RT_DEFAULT_TARGET_ARCH} MATCHES "^arm")		if (${COMPILER_RT_DEFAULT_TARGET_ARCH} MATCHES "^arm")
set(COMPILER_RT_DEFAULT_TARGET_ARCH "armhf")		set(COMPILER_RT_DEFAULT_TARGET_ARCH "armhf")
endif()		endif()
endif()		endif()

▲ Show 20 Lines • Show All 216 Lines • Show Last 20 Lines