commit 056ec12ca14ee5014ea49786f719ceaa299a7e19
author Daniel Jasper <djasper@google.com> Mon Aug 05 20:26:17 2013 +0000
committer Daniel Jasper <djasper@google.com> Mon Aug 05 20:26:17 2013 +0000
tree 3e4ecfd463230a6363dc1117a28a2687018d7bc3
parent de56bb733f6934080ed8b1a7db3ce2ba1852e91e

Add option to disable module loading.

This patch was created by Lawrence Crowl and reviewed in:
http://llvm-reviews.chandlerc.com/D963

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187738 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Lex/Preprocessor.cpp

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 66f23f1..035f751 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -734,7 +734,7 @@
   }
 
   // If we have a non-empty module path, load the named module.
-  if (!ModuleImportPath.empty()) {
+  if (!ModuleImportPath.empty() && getLangOpts().Modules) {
     Module *Imported = TheModuleLoader.loadModule(ModuleImportLoc,
                                                   ModuleImportPath,
                                                   Module::MacrosVisible,