summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/bootstrap-host4
-rwxr-xr-xscripts/bootstrap.sh11
2 files changed, 10 insertions, 5 deletions
diff --git a/scripts/bootstrap-host b/scripts/bootstrap-host
index 7619f68a9..e69de29bb 100755
--- a/scripts/bootstrap-host
+++ b/scripts/bootstrap-host
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-cd "${BASE}"/bootstrap;
-./bootstrap;
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 21156c5ad..6948801a8 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -460,6 +460,14 @@ ${MTOOLS}/sys/emus/bin/proot \
# toolchains must be the first ones found; e.g. '/usr/bin/gcc'
# is a symlink to 'ccache' and isn't a functional compiler.
#
+# NOTE: 'LD_LIBRARY_PATH' is needed because of nonstandard path
+# of toolchain, which otherwise produces these errors:
+#
+# Error loading shared library libstdc++.so.6:
+# Exec format error (needed by ...)
+# Error loading shared library libgcc_s.so.1:
+# Exec format error (needed by ...)
+#
# Once 'coreutils' is built, 'uname' will return correctly, then
# future software should(tm) build as if it is built natively.
#
@@ -467,6 +475,7 @@ ${MTOOLS}/sys/emus/bin/proot \
#
PROOT_NO_SECCOMP=1 \
PATH="/tc/native/bin:${DEF_PATH}" \
+LD_LIBRARY_PATH=/tc/native/lib \
SHELL=/bin/sh \
BASE="${BASE}" \
DEST="${BASE}"/mcmtools-${TARGET} \
@@ -477,7 +486,7 @@ ${MTOOLS}/sys/emus/bin/proot \
-q "${MTOOLS}"/sys/emus/bin/qemu-${q} \
-b "${HERE}" \
-k "3.2.0" \
- "${HERE}"/bootstrap-host \
+ "${BASE}"/bootstrap/bootstrap \
;