summaryrefslogtreecommitdiff
path: root/bootstrap.1
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2011-04-18 15:59:15 +0000
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 18:18:51 +0200
commit9360e44ce3c3db981fca2c52bf68ddd6940c12eb (patch)
treecd325464cdaf7cd60982b65217f43c2c6d90d553 /bootstrap.1
parent00610e27d156a8c56d33debbaba4ac55b7ec9e87 (diff)
gnumake4: #i117687#: source the right *Env.Set.sh in bootstrap: [hg:ffdb9023a592]
add source_soenv.sh: detects the platform and sources the right *Env.Set.sh. bootstrap and the root GNUmakefile call source_soenv.sh.
Diffstat (limited to 'bootstrap.1')
-rw-r--r--bootstrap.18
1 files changed, 8 insertions, 0 deletions
diff --git a/bootstrap.1 b/bootstrap.1
index 24edc7581e97..2a475bf1ef52 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -1,4 +1,12 @@
+if test -z "${SOLARENV}"; then
+ if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi
+fi
+if test -z "${SOLARENV}"; then
+ echo "bootstrap: No environment set!"
+ exit 1
+fi
+
# remove aliases set by *Env.Set.sh
unalias mkout
unalias deliver