@@ -236,7 +236,8 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
236
236
assert (Output.isNothing () && " Invalid output." );
237
237
}
238
238
239
- if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nostartfiles)) {
239
+ if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nostartfiles,
240
+ options::OPT_r)) {
240
241
if (!Args.hasArg (options::OPT_shared)) {
241
242
CmdArgs.push_back (
242
243
Args.MakeArgString (ToolChain.GetFilePath (" crt0.o" )));
@@ -294,7 +295,8 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
294
295
}
295
296
}
296
297
297
- if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
298
+ if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nodefaultlibs,
299
+ options::OPT_r)) {
298
300
// Use the static OpenMP runtime with -static-openmp
299
301
bool StaticOpenMP = Args.hasArg (options::OPT_static_openmp) &&
300
302
!Args.hasArg (options::OPT_static);
@@ -330,7 +332,8 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
330
332
}
331
333
}
332
334
333
- if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nostartfiles)) {
335
+ if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nostartfiles,
336
+ options::OPT_r)) {
334
337
if (Args.hasArg (options::OPT_shared) || Args.hasArg (options::OPT_pie))
335
338
CmdArgs.push_back (
336
339
Args.MakeArgString (ToolChain.GetFilePath (" crtendS.o" )));
0 commit comments