From f258ff1fa9d926519c8b0cbb159d39b89dd1437f Mon Sep 17 00:00:00 2001 From: Serge Pavlov Date: Sun, 20 Nov 2016 06:25:07 +0000 Subject: [PATCH] Fix file name resolution in nested response files If a response file in construct `@file` was specified by relative name, constructs `@file` nested within it were resolved incorrectly if the flag RelativeNames in call to ExpandResponseFile was set to true. This feature is used in configuration files, tests for it are in respective change (see D24933). llvm-svn: 287482 --- llvm/lib/Support/CommandLine.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp index dccb5d6..c9751c0 100644 --- a/llvm/lib/Support/CommandLine.cpp +++ b/llvm/lib/Support/CommandLine.cpp @@ -30,6 +30,7 @@ #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/FileSystem.h" #include "llvm/Support/Host.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryBuffer.h" @@ -911,6 +912,11 @@ static bool ExpandResponseFile(StringRef FName, StringSaver &Saver, if (llvm::sys::path::is_relative(FileName)) { SmallString<128> ResponseFile; ResponseFile.append(1, '@'); + if (llvm::sys::path::is_relative(FName)) { + SmallString<128> curr_dir; + llvm::sys::fs::current_path(curr_dir); + ResponseFile.append(curr_dir.str()); + } llvm::sys::path::append( ResponseFile, llvm::sys::path::parent_path(FName), FileName); NewArgv[I] = Saver.save(ResponseFile.c_str()).data(); -- 2.7.4