diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp index f67de4c58032..694f99f46236 100644 --- a/lld/COFF/Driver.cpp +++ b/lld/COFF/Driver.cpp @@ -233,7 +233,7 @@ bool LinkerDriver::link(llvm::ArrayRef ArgsArr) { return llvm::libDriverMain(ArgsArr.slice(1)) == 0; // Parse command line options. - auto ArgsOrErr = Parser.parse(ArgsArr); + auto ArgsOrErr = Parser.parseLINK(ArgsArr); if (auto EC = ArgsOrErr.getError()) { llvm::errs() << EC.message() << "\n"; return false; diff --git a/lld/COFF/Driver.h b/lld/COFF/Driver.h index 4258ccaf825f..43e800548190 100644 --- a/lld/COFF/Driver.h +++ b/lld/COFF/Driver.h @@ -44,6 +44,9 @@ public: // Parses command line options. ErrorOr parse(llvm::ArrayRef Args); + // Concatenate LINK environment varirable and given arguments and parse them. + ErrorOr parseLINK(llvm::ArrayRef Args); + // Tokenizes a given string and then parses as command line options. ErrorOr parse(StringRef S) { return parse(tokenize(S)); diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp index ac186ee635b5..464afb222663 100644 --- a/lld/COFF/DriverUtils.cpp +++ b/lld/COFF/DriverUtils.cpp @@ -577,6 +577,17 @@ ArgParser::parse(llvm::ArrayRef Args) { return parse(V); } +ErrorOr +ArgParser::parseLINK(ArrayRef Args) { + // Concatenate LINK env and given arguments and parse them. + Optional Env = Process::GetEnv("LINK"); + if (!Env) + return parse(Args); + std::vector V = tokenize(*Env); + V.insert(V.end(), Args.begin() + 1, Args.end()); + return parse(V); +} + std::vector ArgParser::tokenize(StringRef S) { SmallVector Tokens; BumpPtrStringSaver Saver(AllocAux); diff --git a/lld/test/COFF/linkenv.test b/lld/test/COFF/linkenv.test new file mode 100644 index 000000000000..25253c6490b4 --- /dev/null +++ b/lld/test/COFF/linkenv.test @@ -0,0 +1,5 @@ +# RUN: env LINK="-help -foo" lld -flavor link2 >& %t.log +# RUN: FileCheck %s < %t.log + +CHECK: unknown argument: -foo +CHECK: OVERVIEW: LLVM Linker