1 files changed, 23 insertions, 21 deletions

diff --git a/src/task_so.cc b/src/task_so.cc
index ba96388..f922ac3 100644
--- a/src/task_so.cc
+++ b/src/task_so.cc
@@ -11,15 +11,15 @@
 #include "util.h"
 #include "tools.h"
 
-TaskSO::TaskSO(const ctor::build_configuration& config,
-               const ctor::settings& settings,
+TaskSO::TaskSO(const ctor::build_configuration& config_,
+               const ctor::settings& settings_,
                const std::string& target,
                const std::vector<std::string>& objects,
-               const std::string& sourceDir)
-	: Task(config, settings, sourceDir)
-	, config(config)
-	, settings(settings)
-	, sourceDir(sourceDir)
+               const std::string& sourceDir_)
+	: Task(config_, settings_, sourceDir_)
+	, config(config_)
+	, settings(settings_)
+	, sourceDir(sourceDir_)
 {
 	std::filesystem::path base = sourceDir;
 
@@ -36,11 +36,6 @@ TaskSO::TaskSO(const ctor::build_configuration& config,
 		dependsStr.push_back(objectFile.string());
 	}
 
-	for(const auto& dep : config.depends)
-	{
-		depFiles.push_back(dep);
-	}
-
 	flagsFile = std::filesystem::path(settings.builddir) / cleanUp(sourceDir) / targetFile().stem();
 	flagsFile += ".flags";
 
@@ -110,11 +105,24 @@ int TaskSO::runInner()
 
 	if(settings.verbose == 0)
 	{
-		std::cout << "LD => " << targetFile().string() << std::endl;
+		std::string output = "LD => " + targetFile().string() + '\n';
+		std::cout << output << std::flush;
 	}
 
 	auto tool = compiler();
-	return execute(tool, args, {}, settings.verbose > 0);
+	const auto& cfg = ctor::get_configuration();
+	auto ldflags = cfg.getenv("LDFLAGS");
+	if(!ldflags.empty())
+	{
+		append(args, ld_option(toolchain, ctor::ld_opt::custom, ldflags));
+	}
+	auto res = execute(settings, tool, args, cfg.env);
+	if(res != 0)
+	{
+		std::filesystem::remove(targetFile());
+	}
+
+	return res;
 }
 
 int TaskSO::clean()
@@ -142,11 +150,6 @@ std::vector<std::string> TaskSO::depends() const
 		deps.push_back(objectFile.string());
 	}
 
-	for(const auto& depFile : depFiles)
-	{
-		deps.push_back(depFile.string());
-	}
-
 	return deps;
 }
 
@@ -182,11 +185,10 @@ std::string TaskSO::flagsString() const
 			flagsStr += str;
 		}
 	}
-	flagsStr += "\n";
 
 	for(const auto& dep : config.depends)
 	{
-		if(dep != config.depends[0])
+		if(&dep != &config.depends[0])
 		{
 			flagsStr += " ";
 		}