diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83f44b8a878..8d808664c1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -743,6 +743,7 @@ if( MINGW )
 endif()
 
 # Put this before tblgen. Else we have a circular dependence.
+add_subdirectory(lib/Demangle)
 add_subdirectory(lib/Support)
 add_subdirectory(lib/TableGen)
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 6b8846314ec..54aa0a9e328 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,6 +1,6 @@
-# `Support' and `TableGen' libraries are added on the top-level CMakeLists.txt
+# `Demangle', `Support' and `TableGen' libraries are added on the top-level
+# CMakeLists.txt
 
-add_subdirectory(Demangle)
 add_subdirectory(IR)
 add_subdirectory(IRReader)
 add_subdirectory(CodeGen)