Fix (part of) issue #1061.

An attempt to fix a test case results in breaking compiling with dub.
This PR reverts part of the former fix.

The changed test case is missing.
This commit is contained in:
Kai Nacke 2015-09-09 16:06:04 +02:00
parent 3addf84423
commit 2a206453c0

View file

@ -453,8 +453,11 @@ void createStaticLibrary()
else
libName = "a.out";
}
if (!FileName::absolute(libName.c_str()))
libName = FileName::combine(global.params.objdir, libName.c_str());
// KN: The following lines were added to fix a test case failure (runnable/test13774.sh).
// Root cause is that dmd handles it in this why.
// As a side effect this change broke compiling with dub.
// if (!FileName::absolute(libName.c_str()))
// libName = FileName::combine(global.params.objdir, libName.c_str());
std::string libExt = std::string(".") + global.lib_ext;
if (!endsWith(libName, libExt))
libName.append(libExt);