From 59c8457f01f908e75d0e61ec3bd99cebcd672cee Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Sat, 16 Jul 2011 10:50:05 +0000 Subject: [PATCH] Correctly handle sysroot prefix in -print-search-dirs. Makes libtool more happy on NetBSD. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135344 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Driver.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 616207bf76..789f6f7ae9 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -458,11 +458,20 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { } llvm::outs() << "\n"; llvm::outs() << "libraries: ="; + + std::string sysroot; + if (Arg *A = C.getArgs().getLastArg(options::OPT__sysroot_EQ)) + sysroot = A->getValue(C.getArgs()); + for (ToolChain::path_list::const_iterator it = TC.getFilePaths().begin(), ie = TC.getFilePaths().end(); it != ie; ++it) { if (it != TC.getFilePaths().begin()) llvm::outs() << ':'; - llvm::outs() << *it; + const char *path = it->c_str(); + if (path[0] == '=') + llvm::outs() << sysroot << path + 1; + else + llvm::outs() << path; } llvm::outs() << "\n"; return false; -- 2.50.1