From 7acebe4cf1f69d1723e9ae93dc324b9860de04c0 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Fri, 11 Sep 2015 03:58:07 +0000 Subject: [modules] Don't load files specified by -fmodule-file= when modules are disabled. (We still allow this via -cc1 / -Xclang, primarily for testing.) llvm-svn: 247384 --- clang/lib/Driver/Tools.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'clang/lib/Driver/Tools.cpp') diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 7c859850592..b83f3fa1fce 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -4461,7 +4461,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgs(CmdArgs, options::OPT_fmodule_map_file); // -fmodule-file can be used to specify files containing precompiled modules. - Args.AddAllArgs(CmdArgs, options::OPT_fmodule_file); + if (HaveModules) + Args.AddAllArgs(CmdArgs, options::OPT_fmodule_file); + else + Args.ClaimAllArgs(options::OPT_fmodule_file); // -fmodule-cache-path specifies where our implicitly-built module files // should be written. -- cgit v1.2.3