[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/LinkTarget.mk      |    5 +++--
 solenv/gbuild/platform/macosx.mk |   10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 0683821d07132fb7635174b46d7423ecabc2703e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 3 12:01:31 2012 +0200

    gbuild: ObjC command invocation more consistent

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 8cef9b9..83f395a 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 22a1fa8..e501c2b 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
commit adaf721ccdac1d08c9fd63d72844bc5bcc1875e6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 3 11:55:28 2012 +0200

    LinkTarget.mk: only call gb_Object__command_dep if dep file doesn't exist
    
    (infinite loop regression from a4e2453b42b54ba904c1ee8ad07e26f1e6d939e5)

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 11eeb02..8cef9b9 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -236,7 +236,8 @@ $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%)
-	$(call gb_Object__command_dep,$@,$(call gb_ObjCObject_get_target,$*))
+	$(if $(wildcard $@),touch $@,\
+	  $(call gb_Object__command_dep,$@,$(call gb_ObjCObject_get_target,$*)))
 
 endif