diff --git a/source/dub/compilers/dmd.d b/source/dub/compilers/dmd.d index f5df9f3..751886e 100644 --- a/source/dub/compilers/dmd.d +++ b/source/dub/compilers/dmd.d @@ -84,12 +84,6 @@ settings.addDFlags(t[1]); } - if (!(fields & BuildSetting.libs)) { - resolveLibs(settings); - version(Windows) settings.addSourceFiles(settings.libs.map!(l => l~".lib")().array()); - else settings.addLFlags(settings.libs.map!(l => "-l"~l)().array()); - } - if (!(fields & BuildSetting.versions)) { settings.addDFlags(settings.versions.map!(s => "-version="~s)().array()); settings.versions = null; @@ -115,6 +109,12 @@ settings.sourceFiles = null; } + if (!(fields & BuildSetting.libs)) { + resolveLibs(settings); + version(Windows) settings.addSourceFiles(settings.libs.map!(l => l~".lib")().array()); + else settings.addLFlags(settings.libs.map!(l => "-l"~l)().array()); + } + if (!(fields & BuildSetting.lflags)) { settings.addDFlags(settings.lflags.map!(f => "-L"~f)().array()); settings.lflags = null; diff --git a/source/dub/compilers/gdc.d b/source/dub/compilers/gdc.d index 642aa0d..db392e7 100644 --- a/source/dub/compilers/gdc.d +++ b/source/dub/compilers/gdc.d @@ -73,11 +73,6 @@ settings.addDFlags(t[1]); } - if (!(fields & BuildSetting.libs)) { - resolveLibs(settings); - settings.addDFlags(settings.libs.map!(l => "-l"~l)().array()); - } - if (!(fields & BuildSetting.versions)) { settings.addDFlags(settings.versions.map!(s => "-fversion="~s)().array()); settings.versions = null; @@ -103,6 +98,11 @@ settings.sourceFiles = null; } + if (!(fields & BuildSetting.libs)) { + resolveLibs(settings); + settings.addDFlags(settings.libs.map!(l => "-l"~l)().array()); + } + if (!(fields & BuildSetting.lflags)) { foreach( f; settings.lflags ) settings.addDFlags(["-Xlinker", f]); diff --git a/source/dub/compilers/ldc.d b/source/dub/compilers/ldc.d index 8539250..3ed4a87 100644 --- a/source/dub/compilers/ldc.d +++ b/source/dub/compilers/ldc.d @@ -88,11 +88,6 @@ // since LDC always outputs multiple object files, avoid conflicts by default settings.addDFlags("-oq", "-od=.dub/obj"); - if (!(fields & BuildSetting.libs)) { - resolveLibs(settings); - settings.addLFlags(settings.libs.map!(l => "-l"~l)().array()); - } - if (!(fields & BuildSetting.versions)) { settings.addDFlags(settings.versions.map!(s => "-d-version="~s)().array()); settings.versions = null; @@ -118,6 +113,11 @@ settings.sourceFiles = null; } + if (!(fields & BuildSetting.libs)) { + resolveLibs(settings); + settings.addLFlags(settings.libs.map!(l => "-l"~l)().array()); + } + if (!(fields & BuildSetting.lflags)) { settings.addDFlags(settings.lflags.map!(s => "-L="~s)().array()); settings.lflags = null;