Skip to content

Commit 319e7df

Browse files
committed
Merging r354721:
------------------------------------------------------------------------ r354721 | brad | 2019-02-23 07:19:28 +0100 (Sat, 23 Feb 2019) | 4 lines Remove sanitizer context workaround no longer necessary The base linker is now lld. ------------------------------------------------------------------------ llvm-svn: 354858
1 parent e745d6d commit 319e7df

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

clang/lib/Driver/ToolChains/OpenBSD.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,7 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
227227
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtend)));
228228
}
229229

230-
const char *Exec = Args.MakeArgString(
231-
!NeedsSanitizerDeps ? ToolChain.GetLinkerPath()
232-
: ToolChain.GetProgramPath("ld.lld"));
230+
const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath());
233231
C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
234232
}
235233

0 commit comments

Comments
 (0)