From b191b641b41fce544a62c3bbc14b9e94272446d0 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Wed, 27 Jul 2011 14:11:32 +0200 Subject: unbreak NOOPTFLAGS again, after some gbuild merge I would like to ask everyone to be careful while doing merges, this is second thing i had to fix which was fixed already by months ago. --- solenv/gbuild/LinkTarget.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv/gbuild/LinkTarget.mk') diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index d249db7c91cb..25f9737fb403 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -737,7 +737,7 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2) $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2)) $(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) -$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) $(CXXFLAGS) +$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2) @@ -808,7 +808,7 @@ $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3 endef define gb_LinkTarget_add_generated_exception_object -$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS)) +$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) $(CXXFLAGS)) endef define gb_LinkTarget_add_generated_exception_objects -- cgit