From fffa8635361639acadb78089c5b9b445c0aa1d30 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Sat, 18 Dec 2010 07:37:18 +0000 Subject: Revert r122143 through r122140, which collectively broke the LLVMC tests on the buildbots. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122149 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-ld/llvm-ld.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp index 475fcf4d8a..445366c0f7 100644 --- a/tools/llvm-ld/llvm-ld.cpp +++ b/tools/llvm-ld/llvm-ld.cpp @@ -526,7 +526,7 @@ int main(int argc, char **argv, char **envp) { initializeTarget(Registry); // Initial global variable above for convenience printing of program name. - progname = sys::path::stem(argv[0]); + progname = sys::Path(argv[0]).getBasename(); // Parse the command line options cl::ParseCommandLineOptions(argc, argv, "llvm linker\n"); @@ -538,8 +538,11 @@ int main(int argc, char **argv, char **envp) { OutputFilename = "a.exe"; // If there is no suffix add an "exe" one. - if (sys::path::extension(OutputFilename).empty()) - OutputFilename.append(".exe"); + sys::Path ExeFile( OutputFilename ); + if (ExeFile.getSuffix() == "") { + ExeFile.appendSuffix("exe"); + OutputFilename = ExeFile.str(); + } } #endif -- cgit v1.2.3