From 0686300c9b28ffdacf5a7a1363b2c5e294d00997 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Sun, 5 Jun 2011 12:15:41 +0200 Subject: [PATCH] set gb_COMPILEROPTFLAGS in the correct place for cxx generated objects --- solenv/gbuild/LinkTarget.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b71a05de0f17..fe39548e253c 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -569,7 +569,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)) : CXXFLAGS += $(3) $(gb_COMPILEROPTFLAGS) +$(call gb_GenCxxObject_get_target,$(2)) : CXXFLAGS += $(3) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2) @@ -629,7 +629,7 @@ $(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj))) endef define gb_LinkTarget_add_generated_exception_object -$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS)) +$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS)) endef define gb_LinkTarget_add_generated_exception_objects