diff options
| author | David Tardon <dtardon@redhat.com> | 2011-12-14 07:11:47 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-12-14 07:11:51 +0100 |
| commit | ee29bb2a47311d86f794d10bbcfad27644baebb5 (patch) | |
| tree | 63bad01d97e173aea6ff9094ebf2b33ff3596ca8 /solenv | |
| parent | fdo#39118: Fixed chart listener registration during ODS import. (diff) | |
| download | core-ee29bb2a47311d86f794d10bbcfad27644baebb5.tar.gz core-ee29bb2a47311d86f794d10bbcfad27644baebb5.zip | |
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...
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CustomTarget.mk | 1 |
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)) |