summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-05-07 18:29:52 +0200
committerMichael Stahl <mstahl@redhat.com>2012-05-08 11:27:49 +0200
commitae17a1966d58faaa7350a85f7e91f16ee3fd1fb5 (patch)
tree1a62bbf5e3ac7e6fbb8aa71738d25943f0b6aa76
parente7a3d1a289d618e8ebfdebfa986d62ede189df6c (diff)
gbuild: add CFLAGS to generated C objects as well
(was broken by ebed42c38ae91147633c47873307e07984bc62c1)
-rw-r--r--solenv/gbuild/LinkTarget.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f5b5a08a8bb2..5d256152a287 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -839,7 +839,7 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2)
$(call gb_GenCObject_get_source,$(2)) : | $(gb_Helper_MISCDUMMY)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCObject_get_target,$(2))
$(call gb_GenCObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(3)
+$(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(call gb_LinkTarget__get_cflags,$(4)) $(3)
$(call gb_GenCObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
@@ -987,7 +987,7 @@ $(foreach obj,$(2),$(eval $(call gb_GenCxxObject_get_target,$(obj)) : CXXOBJECT_
endef
define gb_LinkTarget_add_generated_cobjects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3)))
+$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3),$(4)))
endef
define gb_LinkTarget_add_generated_cxxobjects