diff options
| author | Robert Nagy <robert@openbsd.org> | 2011-07-27 14:11:32 +0200 |
|---|---|---|
| committer | Robert Nagy <robert@openbsd.org> | 2011-07-27 14:12:54 +0200 |
| commit | b191b641b41fce544a62c3bbc14b9e94272446d0 (patch) | |
| tree | eecc65113b971fbcb23d6d2da7fce8697237b18f /solenv | |
| parent | 6dcad21472608364ba15849acc09e5ae79be16ac (diff) | |
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.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 |