mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: ObjC command invocation more consistent

Browse Source
This commit is contained in:
Michael Stahl
2012-04-03 12:01:31 +02:00
parent adaf721ccd
commit 0683821d07
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
solenv/gbuild/LinkTarget.mk
View File

@@ -232,7 +232,7 @@ gb_ObjCObject_get_source = $(1)/$(2).m
# gb_ObjCObject__command # gb_ObjCObject__command
$(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
$(call gb_ObjCObject__command,$@,$*,$<) $(call gb_ObjCObject__command,$@,$*,$<,$(call gb_ObjObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true)) ifeq ($(gb_FULLDEPS),$(true))
$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%) $(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%)

10
solenv/gbuild/platform/macosx.mk
View File

@@ -132,15 +132,15 @@ endef
define gb_ObjCObject__command define gb_ObjCObject__command
$(call gb_Output_announce,$(2),$(true),OCC,3) $(call gb_Output_announce,$(2),$(true),OCC,3)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(1)) $(dir $(4)) && \
mkdir -p $(dir $(call gb_ObjCObject_get_dep_target,$(2))) && \
$(gb_CC) \ $(gb_CC) \
$(DEFS) $(T_OBJCFLAGS) \ $(DEFS) \
$(T_OBJCFLAGS) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
-c $(3) \ -c $(3) \
-o $(1) \ -o $(1) \
-MMD -MT $(call gb_ObjCObject_get_target,$(2)) \ -MMD -MT $(1) \
-MP -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ -MP -MF $(4) \
-I$(dir $(3)) \ -I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE)) $(INCLUDE_STL) $(INCLUDE))
endef endef