Skip to content

Commit

Permalink
Fix (part of) issue #1061.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
redstar committed Sep 9, 2015
1 parent 3addf84 commit 2a20645
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions driver/linker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2a20645

Please sign in to comment.