[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[David Tardon]

 solenv/gbuild/CustomTarget.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7c6c630b08b77f20f93cfa114c040fc3947f1c61
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 14 07:11:47 2011 +0100

    force gbuild stage for CustomTargets
    
    gb_SourceEnvAndRecurse_STAGE is unset in CustomTarget's make process
    when the parent make has been started in sourced environment. This leads
    to all sorts of "interesting" failures because the gbuild classes and
    platform stuff are not loaded...
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 41b23b8..1e075af 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -31,6 +31,7 @@ define gb_CustomTarget__command
 +$(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
 	O='$(OUTDIR)' R='$(REPODIR)' S='$(SRCDIR)' W='$(WORKDIR)' gb_AWK='$(gb_AWK)' \
+	gb_SourceEnvAndRecurse_STAGE=gbuild \
 	gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' SRCDIR='$(SRCDIR)' \
 	$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
 	touch $(1))