D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-31 20:13:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor code to create directory into new function.

Browse Source
This commit is contained in:
kai
2012-09-16 12:00:14 +02:00
parent 1773f7c7d9
commit 9bc844b6dd
1 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
driver/linker.cpp
View File

@@ -57,7 +57,7 @@ void linkModules(llvm::Module* dst, const Module_vector& MV)
//////////////////////////////////////////////////////////////////////////////
int ExecuteToolAndWait(llvm::sys::Path tool, std::vector<std::string> args, bool verbose = false)
static int ExecuteToolAndWait(llvm::sys::Path tool, std::vector<std::string> args, bool verbose = false)
{
// Construct real argument list.
// First entry is the tool itself, last entry must be NULL.
@@ -94,15 +94,29 @@ int ExecuteToolAndWait(llvm::sys::Path tool, std::vector<std::string> args, bool
//////////////////////////////////////////////////////////////////////////////
static void CreateDirectoryOnDisk(llvm::StringRef fileName)
{
llvm::sys::Path dir(llvm::sys::path::parent_path(fileName));
if (!dir.empty() && !llvm::sys::fs::exists(dir.str()))
{
std::string errstr;
dir.createDirectoryOnDisk(true, &errstr);
if (!errstr.empty())
{
error("failed to create path to file: %s\n%s", dir.c_str(), errstr.c_str());
fatal();
}
}
}
//////////////////////////////////////////////////////////////////////////////
static llvm::sys::Path gExePath;
int linkObjToBinary(bool sharedLib)
{
Logger::println("*** Linking executable ***");
// error string
std::string errstr;
// find gcc for linking
llvm::sys::Path gcc = getGcc();
@@ -168,16 +182,7 @@ int linkObjToBinary(bool sharedLib)
assert(gExePath.isValid());
// create path to exe
llvm::sys::Path exedir(llvm::sys::path::parent_path(gExePath.str()));
if (!exedir.empty() && !llvm::sys::fs::exists(exedir.str()))
{
exedir.createDirectoryOnDisk(true, &errstr);
if (!errstr.empty())
{
error("failed to create path to linking output: %s\n%s", exedir.c_str(), errstr.c_str());
fatal();
}
}
CreateDirectoryOnDisk(gExePath.str());
// additional linker switches
for (unsigned i = 0; i < global.params.linkswitches->dim; i++)
@@ -248,9 +253,6 @@ void createStaticLibrary()
const bool isTargetWindows = llvm::Triple(global.params.targetTriple).isOSWindows();
// error string
std::string errstr;
// find archiver
llvm::sys::Path tool = isTargetWindows ? getLib() : getArchiver();
@@ -302,16 +304,7 @@ void createStaticLibrary()
}
// create path to the library
llvm::sys::Path libdir(llvm::sys::path::parent_path(libName));
if (!libdir.empty() && !llvm::sys::fs::exists(libdir.str()))
{
libdir.createDirectoryOnDisk(true, &errstr);
if (!errstr.empty())
{
error("failed to create path to linking output: %s\n%s", libdir.c_str(), errstr.c_str());
fatal();
}
}
CreateDirectoryOnDisk(libName);
// try to call archiver
ExecuteToolAndWait(tool, args, !quiet || global.params.verbose);