shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with properties in different targets not being respected. #1633

Browse Source
This commit is contained in:
Christoffer Lerno
2024-11-21 01:24:44 +01:00
parent 50d31ba398
commit c9793457f3
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
releasenotes.md
View File

@@ -16,6 +16,7 @@
- Fix error when calling `HashMap.remove` on uninitialized `HashMap`.
- Fix issue with resolved try-unwrap in defer.
- Fix issue with overloaded subscript and ++/--.
- Fix issue with properties in different targets not being respected #1633.
### Stdlib changes
- Add `io::MultiReader`, `io::MultiWriter`, and `io::TeeReader` structs.

25
src/build/project.c
View File

@@ -424,12 +424,37 @@ static void load_into_build_target(const char *filename, JSONObject *json, const
target->feature.pass_win64_simd_as_arrays);
}
static void duplicate_prop(const char ***prop_ref)
{
if (!*prop_ref) return;
const char **copy = NULL;
FOREACH(const char *, str, *prop_ref)
{
vec_add(copy, str);
}
*prop_ref = copy;
}
static void project_add_target(const char *filename, Project *project, BuildTarget *default_target, JSONObject *json,
const char *name, const char *type, TargetType target_type)
{
ASSERT0(json->type == J_OBJECT);
BuildTarget *target = CALLOCS(BuildTarget);
*target = *default_target;
duplicate_prop(&target->args);
duplicate_prop(&target->csource_dirs);
duplicate_prop(&target->csources);
duplicate_prop(&target->cinclude_dirs);
duplicate_prop(&target->exec);
duplicate_prop(&target->feature_list);
duplicate_prop(&target->sources);
duplicate_prop(&target->source_dirs);
duplicate_prop(&target->test_source_dirs);
duplicate_prop(&target->libdirs);
duplicate_prop(&target->libs);
duplicate_prop(&target->linker_libdirs);
duplicate_prop(&target->linker_libs);
duplicate_prop(&target->link_args);
vec_add(project->targets, target);
target->name = name;
target->type = target_type;