solenv/gbuild/LinkTarget.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
New commits: commit 0ab8ef7095530652efb4ed2ae2365580c358025a Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Nov 20 22:35:06 2014 +0100 Fix build of ObjC(xx)Objects under COMPILER_PLUGIN_TOOL Change-Id: I7974ee3119e0959cec09eefd5d5e6dcf87e9bd51 diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 0887b6b..9478130 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -319,10 +319,10 @@ ifneq ($(COMPILER_PLUGIN_TOOL),) $(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET) $(call gb_ObjCxxObject__tool_command,$*,$<) else - $(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDIR),%) $(call gb_Output_announce,$*.mm,$(true),OCX,3) $(call gb_CObject__command_pattern,$@,$(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND),$<,$(call gb_ObjCxxObject_get_dep_target,$*),$(T_COMPILER_PLUGINS)) +endif ifeq ($(gb_FULLDEPS),$(true)) $(dir $(call gb_ObjCxxObject_get_dep_target,%)).dir : @@ -335,7 +335,6 @@ $(call gb_ObjCxxObject_get_dep_target,%) : $(if $(wildcard $@),touch $@) endif -endif # ObjCObject class @@ -347,10 +346,10 @@ ifneq ($(COMPILER_PLUGIN_TOOL),) $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET) $(call gb_ObjCObject__tool_command,$*,$<) else - $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) $(call gb_Output_announce,$*.m,$(true),OCC,3) $(call gb_CObject__command_pattern,$@,$(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND),$<,$(call gb_ObjCObject_get_dep_target,$*),$(T_COMPILER_PLUGINS)) +endif ifeq ($(gb_FULLDEPS),$(true)) $(dir $(call gb_ObjCObject_get_dep_target,%)).dir : @@ -363,7 +362,6 @@ $(call gb_ObjCObject_get_dep_target,%) : $(if $(wildcard $@),touch $@) endif -endif # AsmObject class _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits