From c68aa16d46c1961d3ab05b77b2326e8d909b1fc6 Mon Sep 17 00:00:00 2001 From: Manuel Klimek Date: Thu, 19 Mar 2015 12:00:22 +0000 Subject: [PATCH] Add option to switch off putting header modules into the dependency file. llvm-svn: 232721 --- clang/include/clang/Driver/Options.td | 4 ++++ clang/lib/Driver/Tools.cpp | 5 +++-- clang/test/Driver/pch-deps.c | 11 +++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 1dc610b..20b1c43 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -772,6 +772,10 @@ def fno_modules_strict_decluse : Flag <["-"], "fno-strict-modules-decluse">, Gro Flags<[DriverOption]>; def fimplicit_modules : Flag <["-"], "fimplicit-modules">, Group, Flags<[DriverOption]>; +def fmodule_file_deps : Flag <["-"], "fmodule-file-deps">, Group, + Flags<[DriverOption]>; +def fno_module_file_deps : Flag <["-"], "fno-module-file-deps">, Group, + Flags<[DriverOption]>; def fno_ms_extensions : Flag<["-"], "fno-ms-extensions">, Group; def fno_ms_compatibility : Flag<["-"], "fno-ms-compatibility">, Group; def fno_delayed_template_parsing : Flag<["-"], "fno-delayed-template-parsing">, Group; diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 74c5b7f..4ec8cae 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -324,8 +324,9 @@ void Clang::AddPreprocessingOptions(Compilation &C, if (A->getOption().matches(options::OPT_M) || A->getOption().matches(options::OPT_MD)) CmdArgs.push_back("-sys-header-deps"); - - if (isa(JA)) + if ((isa(JA) && + !Args.hasArg(options::OPT_fno_module_file_deps)) || + Args.hasArg(options::OPT_fmodule_file_deps)) CmdArgs.push_back("-module-file-deps"); } diff --git a/clang/test/Driver/pch-deps.c b/clang/test/Driver/pch-deps.c index 3048636..2c140e5 100644 --- a/clang/test/Driver/pch-deps.c +++ b/clang/test/Driver/pch-deps.c @@ -8,3 +8,14 @@ // RUN: FileCheck %s -check-prefix=CHECK-NOPCH -input-file=%t // CHECK-NOPCH: -dependency-file // CHECK-NOPCH-NOT: -module-file-deps + +// RUN: %clang -x c-header %s -o %t.pch -MMD -MT dependencies -MF %t.d \ +// RUN: -fno-module-file-deps -### 2> %t +// RUN: FileCheck %s -check-prefix=CHECK-EXPLICIT -input-file=%t +// CHECK-EXPLICIT: -dependency-file +// CHECK-EXPLICIT-NOT: -module-file-deps + +// RUN: %clang -x c++ %s -o %t.o -MMD -MT dependencies -MF %t.d -fmodule-file-deps -### 2> %t +// RUN: FileCheck %s -check-prefix=CHECK-EXPLICIT-NOPCH -input-file=%t +// CHECK-EXPLICIT-NOPCH: -dependency-file +// CHECK-EXPLICIT-NOPCH: -module-file-deps -- 2.7.4