diff options
Diffstat (limited to 'src/tasks.cc')
| -rw-r--r-- | src/tasks.cc | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/src/tasks.cc b/src/tasks.cc index fb7d72b..f520772 100644 --- a/src/tasks.cc +++ b/src/tasks.cc @@ -82,22 +82,23 @@ std::vector<std::shared_ptr<Task>> taskFactory(const ctor::build_configuration& std::filesystem::path targetFile(config.target); - ctor::target_type target_type{config.type}; - if(target_type == ctor::target_type::automatic) + ctor::target_type resolved_target_type{config.type}; + if(resolved_target_type == ctor::target_type::automatic) { if(!std::holds_alternative<std::monostate>(config.function)) { - target_type = ctor::target_type::function; + resolved_target_type = ctor::target_type::function; } else { - target_type = target_type_from_extension(ctor::toolchain::any, targetFile); + resolved_target_type = + target_type_from_extension(ctor::toolchain::any, targetFile); } } const auto& c = ctor::get_configuration(); std::vector<std::string> objects; - if(target_type != ctor::target_type::function) + if(resolved_target_type != ctor::target_type::function) { for(const auto& source : config.sources) { @@ -105,7 +106,8 @@ std::vector<std::shared_ptr<Task>> taskFactory(const ctor::build_configuration& (config.system == ctor::output_system::build && source.toolchain == c.build_toolchain) || (config.system == ctor::output_system::host && source.toolchain == c.host_toolchain)) { - auto task = std::make_shared<TaskCC>(config, settings, sourceDir, source); + auto task = + std::make_shared<TaskCC>(ctor::target_type::object, config, settings, sourceDir, source); tasks.push_back(task); objects.push_back(task->targetFile().string()); } @@ -117,7 +119,8 @@ std::vector<std::shared_ptr<Task>> taskFactory(const ctor::build_configuration& bool multi{std::holds_alternative<ctor::GeneratorManyToOne>(config.function)}; if(multi) { - auto task = std::make_shared<TaskFn>(config, settings, sourceDir, ""); + auto task = + std::make_shared<TaskFn>(resolved_target_type, config, settings, sourceDir, ""); tasks.push_back(task); objects.push_back(task->target()); } @@ -125,7 +128,8 @@ std::vector<std::shared_ptr<Task>> taskFactory(const ctor::build_configuration& { for(const auto& source : config.sources) { - auto task = std::make_shared<TaskFn>(config, settings, sourceDir, source); + auto task = + std::make_shared<TaskFn>(resolved_target_type, config, settings, sourceDir, source); tasks.push_back(task); objects.push_back(task->target()); } @@ -133,7 +137,7 @@ std::vector<std::shared_ptr<Task>> taskFactory(const ctor::build_configuration& } #endif - switch(target_type) + switch(resolved_target_type) { case ctor::target_type::automatic: // The target_type cannot be Auto @@ -147,25 +151,30 @@ std::vector<std::shared_ptr<Task>> taskFactory(const ctor::build_configuration& case ctor::target_type::static_library: case ctor::target_type::unit_test_library: - tasks.push_back(std::make_shared<TaskAR>(config, settings, config.target, - objects, sourceDir)); + tasks.push_back(std::make_shared<TaskAR>(resolved_target_type, config, settings, + config.target, objects, sourceDir)); break; #ifndef BOOTSTRAP - case ctor::target_type::dynamic_library: + case ctor::target_type::shared_library: // TODO: Use C++20 starts_with if(targetFile.stem().string().substr(0, 3) != "lib") { std::cerr << "Dynamic library target must have 'lib' prefix\n"; exit(1); } - tasks.push_back(std::make_shared<TaskSO>(config, settings, config.target, - objects, sourceDir)); + tasks.push_back(std::make_shared<TaskSO>(resolved_target_type, config, settings, + config.target, objects, sourceDir)); + break; + + case ctor::target_type::module: + tasks.push_back(std::make_shared<TaskSO>(resolved_target_type, config, settings, + config.target, objects, sourceDir)); break; case ctor::target_type::executable: case ctor::target_type::unit_test: - tasks.push_back(std::make_shared<TaskLD>(config, settings, config.target, - objects, sourceDir, is_self)); + tasks.push_back(std::make_shared<TaskLD>(resolved_target_type, config, settings, + config.target, objects, sourceDir, is_self)); break; case ctor::target_type::object: |