From 50161c24c4c949167854c897a02514e959ed55ce Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 19 Oct 2019 17:54:30 +0200
Subject: Recognize various LLD drivers as well as LLVM lib and rc

---
 libbuild2/bin/guess.hxx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'libbuild2/bin/guess.hxx')

diff --git a/libbuild2/bin/guess.hxx b/libbuild2/bin/guess.hxx
index b4239c2..0b33ce9 100644
--- a/libbuild2/bin/guess.hxx
+++ b/libbuild2/bin/guess.hxx
@@ -17,9 +17,10 @@ namespace build2
     // Currently recognized ar/ranlib and their ids:
     //
     // gnu          GNU binutils
-    // llvm         LLVM
+    // llvm         LLVM ar
     // bsd          FreeBSD (and maybe other BSDs)
     // msvc         Microsoft's lib.exe
+    // msvc-llvm    LLVM llvm-lib.exe
     // generic      Generic/unrecognized
     //
     // The signature is normally the --version/-V line.
@@ -50,14 +51,18 @@ namespace build2
 
     // ld information.
     //
-    // Currently recognized linkers and their ids:
+    // Currently recognized linkers and their ids (following cc's type-variant
+    // theme):
     //
     // gnu          GNU binutils ld.bfd
-    // gold         GNU binutils ld.gold
-    // llvm         LLVM lld (note: not llvm-ld or llvm-link)
+    // gnu-gold     GNU binutils ld.gold
+    // gnu-lld      LLVM ld.lld (and older lld)
     // ld64         Apple's new linker
+    // ld64-lld     LLVM ld64.lld
     // cctools      Apple's old/classic linker
     // msvc         Microsoft's link.exe
+    // msvc-lld     LLVM lld-link.exe
+    // wasm-lld     LLVM wasm-ld
     //
     // Note that BSDs are currently using GNU ld but some of them (e.g.,
     // FreeBSD) are hoping to migrate to lld.
@@ -85,6 +90,7 @@ namespace build2
     //
     // gnu          GNU binutils windres
     // msvc         Microsoft's rc.exe
+    // msvc-llvm    LLVM llvm-rc.exe
     //
     // The signature is normally the --version line.
     //
-- 
cgit v1.1