diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-30 15:08:01 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-07 15:53:02 +0100 |
| commit | fbbd5e5c0edef1bb1ae86ed88fc5415f533bca69 (patch) | |
| tree | b60afa6c346693cbe370543683394833350a9ab4 /solenv | |
| parent | ddc71f6537d3b0ecd2c98a42ec48281e0309e576 (diff) | |
do not globally export gb_Helper_execute gb_Helper_set_ld_path
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CustomTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_AuxTargets.mk | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 88e5f99423aa..c55e6d8f9075 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)) && \ gb_AWK=$(gb_AWK) gb_XSLTPROC=$(gb_XSLTPROC) GBUILDDIR=$(GBUILDDIR) SRCDIR=$(SRCDIR) \ + gb_Helper_set_ld_path=$(gb_Helper_set_ld_path) gb_Helper_execute=$(gb_Helper_execute) \ $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \ touch $(1)) diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 8214468f02c3..881aed954f24 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -168,9 +168,6 @@ define gb_Helper_execute $(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1) endef -export gb_Helper_set_ld_path -export gb_Helper_execute - # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use # for libraries from the OUTDIR diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index e585745ea553..b8a002fff95a 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -50,7 +50,7 @@ fetch: $(SRCDIR)/src.downloaded # fixme: can we prevent these exports in the first place? $(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in - $(if $(gb_MINISOLARENV),unset gb_Helper_execute gb_Helper_set_ld_path && $(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2) + $(if $(gb_MINISOLARENV),$(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2) $(WORKDIR)/bootstrap: @cd $(SRCDIR) && ./bootstrap |