diff options
| author | Greg Fitzgerald <gregf@codeaurora.org> | 2014-06-03 04:29:46 +0000 |
|---|---|---|
| committer | Greg Fitzgerald <gregf@codeaurora.org> | 2014-06-03 04:29:46 +0000 |
| commit | 796fba4cd942fea7b1670f468082fe8e182b4abd (patch) | |
| tree | e2c498b2c95c7d16ee7452453951b6c7653581ed /compiler-rt | |
| parent | 5f53ddd0cc284061519c40e0b98cf124db3674fb (diff) | |
| download | bcm5719-llvm-796fba4cd942fea7b1670f468082fe8e182b4abd.tar.gz bcm5719-llvm-796fba4cd942fea7b1670f468082fe8e182b4abd.zip | |
Fix Android build after r210053
llvm-svn: 210069
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 5bede24d6e4..3b524036e43 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -216,21 +216,23 @@ macro(test_target_arch arch) endif() endmacro() -if("${LLVM_NATIVE_ARCH}" STREQUAL "X86") - if (NOT MSVC) - test_target_arch(x86_64 ${TARGET_64_BIT_CFLAGS}) - endif() - test_target_arch(i386 ${TARGET_32_BIT_CFLAGS}) -elseif("${LLVM_NATIVE_ARCH}" STREQUAL "PowerPC") - test_target_arch(powerpc64 ${TARGET_64_BIT_CFLAGS}) -endif() - -# Build ARM libraries if we are configured to test on ARM if(ANDROID) test_target_arch(arm_android "") -elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm|aarch64") - test_target_arch(arm "-march=armv7-a") - test_target_arch(aarch64 "-march=armv8-a") +else() + if("${LLVM_NATIVE_ARCH}" STREQUAL "X86") + if (NOT MSVC) + test_target_arch(x86_64 ${TARGET_64_BIT_CFLAGS}) + endif() + test_target_arch(i386 ${TARGET_32_BIT_CFLAGS}) + elseif("${LLVM_NATIVE_ARCH}" STREQUAL "PowerPC") + test_target_arch(powerpc64 ${TARGET_64_BIT_CFLAGS}) + endif() + + # Build ARM libraries if we are configured to test on ARM + if("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm|aarch64") + test_target_arch(arm "-march=armv7-a") + test_target_arch(aarch64 "-march=armv8-a") + endif() endif() # We support running instrumented tests when we're not cross compiling |
