diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-20 22:35:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-20 22:35:06 +0100 |
| commit | 0ab8ef7095530652efb4ed2ae2365580c358025a (patch) | |
| tree | 8a95bd878406cf7ba286cb648e9edc439bdf8076 /solenv | |
| parent | a91d3c0751f75b08561bf7d047043471956af747 (diff) | |
Fix build of ObjC(xx)Objects under COMPILER_PLUGIN_TOOL
Change-Id: I7974ee3119e0959cec09eefd5d5e6dcf87e9bd51
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 0887b6b6056a..94781309d369 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 |