set gb_COMPILEROPTFLAGS in the correct place for cxx generated objects
This commit is contained in:
parent
acf38a2c77
commit
126ce07a48
1 changed files with 2 additions and 2 deletions
|
@ -667,7 +667,7 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2)
|
||||||
|
|
||||||
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(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_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))
|
ifeq ($(gb_FULLDEPS),$(true))
|
||||||
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
|
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
|
||||||
|
@ -740,7 +740,7 @@ $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define gb_LinkTarget_add_generated_exception_object
|
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
|
endef
|
||||||
|
|
||||||
define gb_LinkTarget_add_generated_exception_objects
|
define gb_LinkTarget_add_generated_exception_objects
|
||||||
|
|
Loading…
Reference in a new issue