@@ -91,7 +91,8 @@ void dragonfly::Linker::ConstructJob(Compilation &C, const JobAction &JA,
91
91
assert (Output.isNothing () && " Invalid output." );
92
92
}
93
93
94
- if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nostartfiles)) {
94
+ if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nostartfiles,
95
+ options::OPT_r)) {
95
96
if (!Args.hasArg (options::OPT_shared)) {
96
97
if (Args.hasArg (options::OPT_pg))
97
98
CmdArgs.push_back (
@@ -119,7 +120,8 @@ void dragonfly::Linker::ConstructJob(Compilation &C, const JobAction &JA,
119
120
120
121
AddLinkerInputs (getToolChain (), Inputs, Args, CmdArgs, JA);
121
122
122
- if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
123
+ if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nodefaultlibs,
124
+ options::OPT_r)) {
123
125
CmdArgs.push_back (" -L/usr/lib/gcc80" );
124
126
125
127
if (!Args.hasArg (options::OPT_static)) {
@@ -158,7 +160,8 @@ void dragonfly::Linker::ConstructJob(Compilation &C, const JobAction &JA,
158
160
}
159
161
}
160
162
161
- if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nostartfiles)) {
163
+ if (!Args.hasArg (options::OPT_nostdlib, options::OPT_nostartfiles,
164
+ options::OPT_r)) {
162
165
if (Args.hasArg (options::OPT_shared) || Args.hasArg (options::OPT_pie))
163
166
CmdArgs.push_back (
164
167
Args.MakeArgString (getToolChain ().GetFilePath (" crtendS.o" )));
0 commit comments