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

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

compiler-rt/

trunk/

2 lines

	Show First 20 Lines • Show All 65 Lines • ▼ Show 20 Lines
	endif()			endif()

	construct_compiler_rt_default_triple()			construct_compiler_rt_default_triple()
	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()
	if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi")			if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" MATCHES "^android")
	set(ANDROID 1)			set(ANDROID 1)
	endif()			endif()
	pythonize_bool(ANDROID)			pythonize_bool(ANDROID)

	set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})			set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
	set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})			set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})

	# We support running instrumented tests when we're not cross compiling			# We support running instrumented tests when we're not cross compiling
	▲ Show 20 Lines • Show All 287 Lines • Show Last 20 Lines