From f2710d4b576053d405af7a0e2a62ea06d5a978e3 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 16 Nov 2020 15:23:02 -0500 Subject: [PATCH] lld/mach-o: Infer darwinnew from filename ld64.lld.darwinnew too `-flavor` is difficult to use through the clang driver since it must be the first argument. clang's `-fuse-ld=foo` looks for `ld64.foo` when targeting darwin, so it's easiest if darwinnew accepts some `ld64.foo`. Let's go with `ld64.lld.darwinnew`, so that `clang -fuse-ld=lld.darwinnew` does the right thing (assuming a symlink with the name `ld64.ld.darwinnew exists in the right place). This is temporary until darwinnew replaces ld64.lld, and it only exists to make testing the new lld port easier. --- lld/tools/lld/lld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp index 5d71a8f..77d7792 100644 --- a/lld/tools/lld/lld.cpp +++ b/lld/tools/lld/lld.cpp @@ -71,7 +71,7 @@ static Flavor getFlavor(StringRef s) { .CasesLower("wasm", "ld-wasm", Wasm) .CaseLower("link", WinLink) .CasesLower("ld64", "ld64.lld", "darwin", Darwin) - .CaseLower("darwinnew", DarwinNew) + .CasesLower("darwinnew", "ld64.lld.darwinnew", DarwinNew) .Default(Invalid); } -- 2.7.4