1 files changed, 67 insertions, 24 deletions

diff --git a/src/task_cc.cc b/src/task_cc.cc
index 4eb07ae..479a453 100644
--- a/src/task_cc.cc
+++ b/src/task_cc.cc
@@ -12,16 +12,24 @@
 #include "execute.h"
 #include "util.h"
 #include "tools.h"
-
-TaskCC::TaskCC(const ctor::build_configuration& config, const ctor::settings& settings,
-               const std::string& sourceDir, const ctor::source& source)
-	: Task(config, settings, sourceDir)
-	, config(config)
-	, settings(settings)
-	, sourceDir(sourceDir)
+#include "deps.h"
+
+TaskCC::TaskCC(ctor::target_type resolved_target_type,
+               const ctor::build_configuration& config_,
+               const ctor::settings& settings_,
+               const std::string& sourceDir_,
+               const ctor::source& source)
+	: Task(resolved_target_type, config_, settings_, sourceDir_)
+	, sourceFile(sourceDir_)
+	, config(config_)
+	, settings(settings_)
+	, sourceDir(sourceDir_)
 	, _source(source)
 {
-	sourceFile = sourceDir;
+	if(source.source_type == ctor::source_type::generated)
+	{
+		sourceFile = std::filesystem::path(settings.builddir) / sourceFile;
+	}
 	sourceFile /= source.file;
 
 	std::filesystem::path base = sourceFile.parent_path();
@@ -30,8 +38,6 @@ TaskCC::TaskCC(const ctor::build_configuration& config, const ctor::settings& se
 	base += "-";
 	base += sourceFile.stem();
 
-	target_type = ctor::target_type::object;
-	output_system = config.system;
 	source_language = source.language;
 	if(source_language == ctor::language::automatic)
 	{
@@ -89,11 +95,6 @@ int TaskCC::registerDepTasksInner(const std::vector<std::shared_ptr<Task>>& task
 	return 0;
 }
 
-std::string TaskCC::name() const
-{
-	return {};
-}
-
 bool TaskCC::dirtyInner()
 {
 	if(!std::filesystem::exists(sourceFile))
@@ -136,7 +137,8 @@ bool TaskCC::dirtyInner()
 		}
 	}
 
-	auto depList = readDeps(depsFile.string());
+	auto toolchain = getToolChain(config.system);
+	auto depList = readDeps(depsFile.string(), toolchain);
 	for(const auto& dep : depList)
 	{
 		if(!std::filesystem::exists(dep) ||
@@ -175,25 +177,59 @@ int TaskCC::runInner()
 
 	if(settings.verbose == 0)
 	{
+		std::string output;
 		switch(sourceLanguage())
 		{
 		case ctor::language::c:
-			std::cout << "CC ";
+			output = "CC ";
 			break;
 		case ctor::language::cpp:
-			std::cout << "CXX ";
+			output = "CXX ";
 			break;
 		case ctor::language::automatic:
 		case ctor::language::assembler:
 			// Only c/c++ handled by this task type.
 			break;
 		}
-		std::cout <<
-			sourceFile.lexically_normal().string() << " => " <<
-			targetFile().lexically_normal().string() << std::endl;
+		output += sourceFile.lexically_normal().string() + " => " +
+			targetFile().lexically_normal().string() + '\n';
+		std::cout << output << std::flush;
+	}
+
+	auto toolchain = getToolChain(config.system);
+	const auto& cfg = ctor::get_configuration();
+	switch(sourceLanguage())
+	{
+	case ctor::language::c:
+		{
+			auto cflags = cfg.getenv("CFLAGS");
+			if(!cflags.empty())
+			{
+				append(args, c_option(toolchain, ctor::c_opt::custom, cflags));
+			}
+		}
+		break;
+	case ctor::language::cpp:
+		{
+			auto cxxflags = cfg.getenv("CXXFLAGS");
+			if(!cxxflags.empty())
+			{
+				append(args, cxx_option(toolchain, ctor::cxx_opt::custom, cxxflags));
+			}
+		}
+		break;
+	case ctor::language::automatic:
+	case ctor::language::assembler:
+		// Only c/c++ handled by this task type.
+		break;
+	}
+	auto res = execute(settings, compiler(), args, cfg.env);
+	if(res != 0)
+	{
+		std::filesystem::remove(targetFile());
 	}
 
-	return execute(compiler(), args, {}, settings.verbose > 0);
+	return res;
 }
 
 int TaskCC::clean()
@@ -221,6 +257,10 @@ int TaskCC::clean()
 
 std::vector<std::string> TaskCC::depends() const
 {
+	if(_source.source_type == ctor::source_type::generated)
+	{
+		return {sourceFile.string()};
+	}
 	return {};
 }
 
@@ -286,6 +326,7 @@ std::vector<std::string> TaskCC::flags() const
 		exit(1);
 		break;
 	}
+
 }
 
 std::string TaskCC::flagsString() const
@@ -309,7 +350,7 @@ std::vector<std::string> TaskCC::getCompilerArgs() const
 	{
 	case ctor::language::c:
 		{
-			append(args, c_option(toolchain, ctor::c_opt::generate_dep_tree));
+			append(args, c_option(toolchain, ctor::c_opt::generate_dep_tree, depsFile.string()));
 
 			if(std::filesystem::path(config.target).extension() == ".so")
 			{
@@ -337,6 +378,7 @@ std::vector<std::string> TaskCC::getCompilerArgs() const
 							path = (sourceDir / path).lexically_normal();
 							append(args, c_option(toolchain,
 							                      ctor::c_opt::include_path, path.string()));
+							continue;
 						}
 					}
 					break;
@@ -351,7 +393,7 @@ std::vector<std::string> TaskCC::getCompilerArgs() const
 
 	case ctor::language::cpp:
 		{
-			append(args, cxx_option(toolchain, ctor::cxx_opt::generate_dep_tree));
+			append(args, cxx_option(toolchain, ctor::cxx_opt::generate_dep_tree, depsFile.string()));
 
 			if(std::filesystem::path(config.target).extension() == ".so")
 			{
@@ -379,6 +421,7 @@ std::vector<std::string> TaskCC::getCompilerArgs() const
 							path = (sourceDir / path).lexically_normal();
 							append(args, cxx_option(toolchain,
 							                        ctor::cxx_opt::include_path, path.string()));
+							continue;
 						}
 					}
 					break;