5 files changed, 30 insertions, 18 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1e42557fe33d..6c1401572c73 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -39,8 +39,7 @@
 ifeq ($(SYSTEM_ZLIB),YES)
 
 define gb_LinkTarget__use_zlib
-$(call gb_LinkTarget_set_defs,$(1),\
-	$$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
 	-DSYSTEM_ZLIB \
 )
 $(call gb_LinkTarget_add_libs,$(1),-lz)
@@ -90,8 +89,7 @@ ifeq ($(SYSTEM_EXPAT),YES)
 define gb_LinkTarget__use_expat
 $(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
 
-$(call gb_LinkTarget_set_defs,$(1),\
-	$$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
 	-DSYSTEM_EXPAT \
 )
 
@@ -110,8 +108,7 @@ define gb_LinkTarget__use_expat
 $(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
 
 $(if $(filter-out ascii_expat_xmlparse,$(2)),\
-	$(call gb_LinkTarget_set_defs,$(1),\
-		$$(DEFS) \
+	$(call gb_LinkTarget_add_defs,$(1),\
 		-DXML_UNICODE \
 ))
 
@@ -136,8 +133,7 @@ endef
 ifeq ($(SYSTEM_LIBXML),YES)
 
 define gb_LinkTarget__use_libxml2
-$(call gb_LinkTarget_set_defs,$(1),\
-	$$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
 	-DSYSTEM_LIBXML \
 )
 $(call gb_LinkTarget_set_include,$(1),\
@@ -190,8 +186,7 @@ endif # SYSTEM_LIBXSLT
 ifeq ($(SYSTEM_REDLAND),YES)
 
 define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_set_defs,$(1),\
-	$$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(1),\
 	-DSYSTEM_REDLAND \
 )
 $(call gb_LinkTarget_set_include,$(1),\
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index fe365fb7502b..a5e5eb08fa90 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -68,8 +68,7 @@ endef
 define gb_Library__Library_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Library)
-$(call gb_LinkTarget_set_defs,$(2),\
-    $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
     $(gb_Library_DEFS) \
 )
 $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 17b6bf350f4d..177b7d36775b 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -423,6 +423,10 @@ endif
 endef
 
 define gb_LinkTarget_set_defs
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.)
+else
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -432,6 +436,7 @@ ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2)
 endif
+endif
 
 endef
 
@@ -444,10 +449,15 @@ endif
 endef
 
 define gb_LinkTarget_set_cflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.)
+else
 $(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2)
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
 endif
+endif
 
 endef
 
@@ -462,8 +472,11 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2)
 endif
 endef
 
-# maybe should deprecate this...
 define gb_LinkTarget_set_cxxflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.)
+else
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -472,6 +485,7 @@ ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
 endif
+endif
 
 endef
 
@@ -483,10 +497,15 @@ endif
 endef
 
 define gb_LinkTarget_set_objcxxflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.)
+else
 $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2)
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
 endif
+endif
 
 endef
 
@@ -512,6 +531,7 @@ define gb_LinkTarget_add_ldflags
 $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
 endef
 
+# real use in RepositoryExternal.mk
 define gb_LinkTarget_set_ldflags
 $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
 endef
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index af7db9ad5641..4d3c22b4e871 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -63,8 +63,7 @@ endef
 define gb_StaticLibrary__StaticLibrary_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
-$(call gb_LinkTarget_set_defs,$(2),\
-    $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
     $(gb_StaticLibrary_DEFS) \
 )
 $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk
index 2e62cfe9a64b..4b6603a05eee 100644
--- a/solenv/gbuild/templates/Library.mk
+++ b/solenv/gbuild/templates/Library.mk
@@ -49,9 +49,8 @@ $(eval $(call gb_Library_set_include,LIB,\
 
 # add any additional definitions to be set for compilation here
 # (e.g. -DLIB_DLLIMPLEMENTATION)
-$(eval $(call gb_Library_set_defs,LIB,\
-    $$(DEFS) \
-))
+#$(eval $(call gb_Library_add_defs,LIB,\
+#))
 
 # add libraries to be linked to LIB; again these names need to be given as
 # specified in Repository.mk