diff --git a/cmake/modules/LLVMConfig.cmake b/cmake/modules/LLVMConfig.cmake
index 1d8d090986d..7c75dd029e0 100755
--- a/cmake/modules/LLVMConfig.cmake
+++ b/cmake/modules/LLVMConfig.cmake
@@ -59,8 +59,8 @@ function(explicit_map_components_to_libraries out_libs)
         list(APPEND expanded_components "LLVM${c}Info")
       endif()
     elseif( c STREQUAL "native" )
-      # TODO: we assume ARCH is X86. In this case, we must use nativecodegen
-      # component instead. Do nothing, as in llvm-config script.
+      # TODO: we assume ARCH is X86.
+      list(APPEND expanded_components "LLVMX86CodeGen")
     elseif( c STREQUAL "nativecodegen" )
       # TODO: we assume ARCH is X86.
       list(APPEND expanded_components "LLVMX86CodeGen")
diff --git a/examples/Kaleidoscope/CMakeLists.txt b/examples/Kaleidoscope/CMakeLists.txt
index 9a18aae3053..af32fbfc512 100644
--- a/examples/Kaleidoscope/CMakeLists.txt
+++ b/examples/Kaleidoscope/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS core jit native)
+set(LLVM_LINK_COMPONENTS core jit interpreter native)
 
 add_llvm_example(Kaleidoscope
   toy.cpp