Skip to content

Commit b6c5153

Browse files
Merge pull request #2098 from swiftwasm/katei/propagate-static-stdlib-5.3
Propagate -use-static-resource-dir for merge-module for 5.3
2 parents 2db367f + 3648456 commit b6c5153

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

lib/Driver/ToolChains.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,13 @@ ToolChain::constructInvocation(const MergeModuleJobAction &job,
10201020

10211021
context.Args.AddLastArg(Arguments, options::OPT_import_objc_header);
10221022

1023+
if (context.Args.hasFlag(options::OPT_static_executable,
1024+
options::OPT_no_static_executable, false) ||
1025+
context.Args.hasFlag(options::OPT_static_stdlib,
1026+
options::OPT_no_static_stdlib, false)) {
1027+
Arguments.push_back("-use-static-resource-dir");
1028+
}
1029+
10231030
Arguments.push_back("-module-name");
10241031
Arguments.push_back(context.Args.MakeArgString(context.OI.ModuleName));
10251032

0 commit comments

Comments
 (0)