diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index ddf807156327..408307082684 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -48,7 +48,7 @@ endif()

 project(LLVM
   VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}
-  LANGUAGES C CXX ASM)
+  LANGUAGES CXX C ASM)

 set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
index 67e2eb1cec14..6e8f476a41aa 100644
--- a/llvm/cmake/config-ix.cmake
+++ b/llvm/cmake/config-ix.cmake
@@ -152,7 +152,9 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
     else()
       set(MAYBE_REQUIRED)
     endif()
-    find_library(TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED})
+    if(LLVM_ENABLE_TERMINFO)
+      find_library(TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED})
+    endif()
     if(TERMINFO_LIB)
       set(LLVM_ENABLE_TERMINFO 1)
     else()