From 76a0154ce5cd60172ded3479bddfdf198b1dddf9 Mon Sep 17 00:00:00 2001 From: Alexandre Ganea Date: Tue, 10 Apr 2018 01:50:25 +0000 Subject: [llvm-ar] Fix lib.exe detection when running within MSVC toolchain Differential Revision: https://reviews.llvm.org/D44808 llvm-svn: 329658 --- llvm/tools/llvm-ar/llvm-ar.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'llvm/tools/llvm-ar/llvm-ar.cpp') diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 0775aff00d2..0a8d59c7ee2 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -109,9 +109,9 @@ MODIFIERS (generic): )"; void printHelpMessage() { - if (Stem.find("ranlib") != StringRef::npos) + if (Stem.find_lower("ranlib") != StringRef::npos) outs() << RanlibHelp; - else if (Stem.find("ar") != StringRef::npos) + else if (Stem.find_lower("ar") != StringRef::npos) outs() << ArHelp; } @@ -960,16 +960,16 @@ int main(int argc, char **argv) { llvm::InitializeAllAsmParsers(); Stem = sys::path::stem(ToolName); - if (Stem.find("dlltool") != StringRef::npos) + if (Stem.find_lower("dlltool") != StringRef::npos) return dlltoolDriverMain(makeArrayRef(argv, argc)); - if (Stem.find("ranlib") != StringRef::npos) + if (Stem.find_lower("ranlib") != StringRef::npos) return ranlib_main(argc, argv); - if (Stem.find("lib") != StringRef::npos) + if (Stem.find_lower("lib") != StringRef::npos) return libDriverMain(makeArrayRef(argv, argc)); - if (Stem.find("ar") != StringRef::npos) + if (Stem.find_lower("ar") != StringRef::npos) return ar_main(argc, argv); fail("Not ranlib, ar, lib or dlltool!"); } -- cgit v1.2.3