back out r149504

Too many weird build failures.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149571 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 5248c2e..89e0600 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -36,9 +36,12 @@
 #include "InputInfo.h"
 #include "ToolChains.h"
 
-#include <map>
+#ifdef HAVE_CLANG_CONFIG_H
+# include "clang/Config/config.h"
+#endif
+#include "llvm/Config/config.h"
 
-#include "clang/Config/config.h"
+#include <map>
 
 using namespace clang::driver;
 using namespace clang;