4 files changed, 20 insertions, 1 deletions
diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
index f67de4c5803..694f99f4623 100644
--- a/lld/COFF/Driver.cpp
+++ b/lld/COFF/Driver.cpp
@@ -233,7 +233,7 @@ bool LinkerDriver::link(llvm::ArrayRef<const char *> 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 4258ccaf825..43e80054819 100644
--- a/lld/COFF/Driver.h
+++ b/lld/COFF/Driver.h
@@ -44,6 +44,9 @@ public:
   // Parses command line options.
   ErrorOr<llvm::opt::InputArgList> parse(llvm::ArrayRef<const char *> Args);
 
+  // Concatenate LINK environment varirable and given arguments and parse them.
+  ErrorOr<llvm::opt::InputArgList> parseLINK(llvm::ArrayRef<const char *> Args);
+
   // Tokenizes a given string and then parses as command line options.
   ErrorOr<llvm::opt::InputArgList> parse(StringRef S) {
     return parse(tokenize(S));
diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp
index ac186ee635b..464afb22266 100644
--- a/lld/COFF/DriverUtils.cpp
+++ b/lld/COFF/DriverUtils.cpp
@@ -577,6 +577,17 @@ ArgParser::parse(llvm::ArrayRef<const char *> Args) {
   return parse(V);
 }
 
+ErrorOr<llvm::opt::InputArgList>
+ArgParser::parseLINK(ArrayRef<const char *> Args) {
+  // Concatenate LINK env and given arguments and parse them.
+  Optional<std::string> Env = Process::GetEnv("LINK");
+  if (!Env)
+    return parse(Args);
+  std::vector<const char *> V = tokenize(*Env);
+  V.insert(V.end(), Args.begin() + 1, Args.end());
+  return parse(V);
+}
+
 std::vector<const char *> ArgParser::tokenize(StringRef S) {
   SmallVector<const char *, 16> Tokens;
   BumpPtrStringSaver Saver(AllocAux);
diff --git a/lld/test/COFF/linkenv.test b/lld/test/COFF/linkenv.test
new file mode 100644
index 00000000000..25253c6490b
--- /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