Index: llvm/trunk/tools/llvm-exegesis/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-exegesis/CMakeLists.txt
+++ llvm/trunk/tools/llvm-exegesis/CMakeLists.txt
@@ -11,8 +11,8 @@
 add_subdirectory(lib)
 
 # Link the native exegesis target if compiled and on the right host.
-if ((LLVM_TARGETS_TO_BUILD MATCHES "X86") AND ("${LLVM_NATIVE_ARCH}" STREQUAL "X86"))
-  set(LLVM_EXEGESIS_NATIVE_ARCH "X86")
+if ((LLVM_TARGETS_TO_BUILD MATCHES "${LLVM_NATIVE_ARCH}") AND (LLVM_EXEGESIS_TARGETS MATCHES "${LLVM_NATIVE_ARCH}"))
+  set(LLVM_EXEGESIS_NATIVE_ARCH "${LLVM_NATIVE_ARCH}")
 endif()
 
 if (LLVM_EXEGESIS_NATIVE_ARCH)
Index: llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
+++ llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
@@ -1,5 +1,6 @@
 if (LLVM_TARGETS_TO_BUILD MATCHES "X86")
   add_subdirectory(X86)
+  set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} X86" PARENT_SCOPE)
 endif()
 
 add_library(LLVMExegesis