[compiler-rt] r210069 - Fix Android build after r210053

[Greg Fitzgerald]

Author: garious
Date: Mon Jun  2 23:29:46 2014
New Revision: 210069

URL: http://llvm.org/viewvc/llvm-project?rev=210069&view=rev
Log:
Fix Android build after r210053

Modified:
    compiler-rt/trunk/CMakeLists.txt

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=210069&r1=210068&r2=210069&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Mon Jun  2 23:29:46 2014
@@ -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