Skip to content

Commit 0d74428

Browse files
committed
Front-end: use separate flag for -swift-module-file instead of EQ
1 parent 01c18d0 commit 0d74428

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

include/swift/Option/FrontendOptions.td

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,9 @@ def enable_resilience : Flag<["-"], "enable-resilience">,
217217
def disable_implicit_swift_modules: Flag<["-"], "disable-implicit-swift-modules">,
218218
HelpText<"Disable building Swift modules explicitly by the compiler">;
219219

220-
def swift_module_file_EQ : Joined<["-"], "swift-module-file=">,
221-
HelpText<"Specify Swift module explicitly built from textual interface">;
220+
def swift_module_file
221+
: Separate<["-"], "swift-module-file">, MetaVarName<"<path>">,
222+
HelpText<"Specify Swift module explicitly built from textual interface">;
222223
}
223224

224225

lib/Frontend/CompilerInvocation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts,
865865
Opts.DisableModulesValidateSystemDependencies |=
866866
Args.hasArg(OPT_disable_modules_validate_system_headers);
867867

868-
for (auto A: Args.filtered(OPT_swift_module_file_EQ)) {
868+
for (auto A: Args.filtered(OPT_swift_module_file)) {
869869
Opts.ExplicitSwiftModules.push_back(resolveSearchPath(A->getValue()));
870870
}
871871
// Opts.RuntimeIncludePath is set by calls to

lib/Frontend/ModuleInterfaceLoader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,8 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
12071207
// Adding these argumnets may not be necessary.
12081208
// FIXME: remove it?
12091209
for (auto EM: searchPathOpts.ExplicitSwiftModules) {
1210-
GenericArgs.push_back(ArgSaver.save((llvm::Twine("-swift-module-file=") + EM).str()));
1210+
GenericArgs.push_back("-swift-module-file");
1211+
GenericArgs.push_back(ArgSaver.save(EM));
12111212
}
12121213
if (clangImporter) {
12131214
// We need to add these extra clang flags because explict module building

0 commit comments

Comments
 (0)