diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-03 12:01:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-03 12:02:19 +0200 |
| commit | 0683821d07132fb7635174b46d7423ecabc2703e (patch) | |
| tree | 99b6bac491ca8b23c80a6703062298a824c768d1 /solenv | |
| parent | adaf721ccdac1d08c9fd63d72844bc5bcc1875e6 (diff) | |
gbuild: ObjC command invocation more consistent
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 8cef9b997971..83f395ac5d64 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -232,7 +232,7 @@ gb_ObjCObject_get_source = $(1)/$(2).m # gb_ObjCObject__command $(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)) $(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 22a1fa8e94d9..e501c2b78f7d 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -132,15 +132,15 @@ endef define gb_ObjCObject__command $(call gb_Output_announce,$(2),$(true),OCC,3) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - mkdir -p $(dir $(call gb_ObjCObject_get_dep_target,$(2))) && \ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ - $(DEFS) $(T_OBJCFLAGS) \ + $(DEFS) \ + $(T_OBJCFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ -c $(3) \ -o $(1) \ - -MMD -MT $(call gb_ObjCObject_get_target,$(2)) \ - -MP -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ + -MMD -MT $(1) \ + -MP -MF $(4) \ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE)) endef |