From c9793457f3046ff0da7179ec87f6c8f4e7bdac97 Mon Sep 17 00:00:00 2001
From: Christoffer Lerno <christoffer@aegik.com>
Date: Thu, 21 Nov 2024 01:24:44 +0100
Subject: [PATCH] Fix issue with properties in different targets not being
 respected. #1633

---
 releasenotes.md     |  1 +
 src/build/project.c | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/releasenotes.md b/releasenotes.md
index 19d5eb079..2593d7644 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -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.
diff --git a/src/build/project.c b/src/build/project.c
index ceacbedb6..ce4b903d4 100644
--- a/src/build/project.c
+++ b/src/build/project.c
@@ -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;