summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-12-14 07:11:47 +0100
committerDavid Tardon <dtardon@redhat.com>2011-12-14 07:20:53 +0100
commit7c6c630b08b77f20f93cfa114c040fc3947f1c61 (patch)
treee95b04c70238bd4246097dc00a0a124898f6e393 /solenv
parentdf27ea1c4e8fb01add490593e923fbdf3211facc (diff)
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@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/CustomTarget.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 41b23b87ad56..1e075af777d1 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))