diff options
Diffstat (limited to 'src/task_ld.cc')
| -rw-r--r-- | src/task_ld.cc | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/src/task_ld.cc b/src/task_ld.cc index b0aa4ae..c7014ff 100644 --- a/src/task_ld.cc +++ b/src/task_ld.cc @@ -11,15 +11,17 @@ #include "util.h" #include "tools.h" -TaskLD::TaskLD(const ctor::build_configuration& config, - const ctor::settings& settings, +TaskLD::TaskLD(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_, + bool is_self_) + : Task(config_, settings_, sourceDir_) + , config(config_) + , settings(settings_) + , sourceDir(sourceDir_) + , is_self(is_self_) { target_type = config.type; output_system = config.system; @@ -39,11 +41,6 @@ TaskLD::TaskLD(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"; @@ -121,11 +118,24 @@ int TaskLD::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, is_self); + if(res != 0) + { + std::filesystem::remove(targetFile()); + } + + return res; } int TaskLD::clean() @@ -153,11 +163,6 @@ std::vector<std::string> TaskLD::depends() const deps.push_back(objectFile.string()); } - for(const auto& depFile : depFiles) - { - deps.push_back(depFile.string()); - } - return deps; } @@ -193,11 +198,10 @@ std::string TaskLD::flagsString() const flagsStr += str; } } - flagsStr += "\n"; for(const auto& dep : config.depends) { - if(dep != config.depends[0]) + if(&dep != &config.depends[0]) { flagsStr += " "; } |