aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2019-06-05 00:06:20 +0200
committerToni Uhlig <matzeton@googlemail.com>2019-06-05 00:06:20 +0200
commit0c603d8a85f9f9d45aa0b97e7dcce72539b9c45b (patch)
treec3136e87a85393f9dc9d928fe34d1f3e6f9f3754
parent80e1d66e344fe9760b04cde8757e6e3fe0426a7b (diff)
enable multilib builds via whiptail
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
-rwxr-xr-xbuild-gcc.sh15
1 files changed, 13 insertions, 2 deletions
diff --git a/build-gcc.sh b/build-gcc.sh
index becfa93..2d77d80 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -10,6 +10,9 @@ set -x
#or
#GCC_VERSION="4.4.2"
#BINUTILS_VERSION="2.25"
+#or
+#GCC_VERSION="4.9.4"
+#BINUTILS_VERSION="2.27"
if [ ! -x /usr/bin/wget -o ! -x /usr/bin/whiptail ]; then
echo "${0}: missing wget/whiptail"
@@ -34,6 +37,14 @@ GCC_MENU=$(echo "${GCC_CONTENT}" | sed -n 's/^"gcc-\(.*\)\/"$/\1 gcc-\1/p')
GCC_VERSION=$(whiptail --menu 'choose gcc version' 35 55 25 ${GCC_MENU} 3>&1 1>&2 2>&3)
echo "gcc: ${GCC_VERSION}"
+# enable multilib?
+MULTILIB_ENABLE=$(whiptail --clear --menu 'enable multilib? (requires libc-dev:i386 as well as libc-dev:amd64)' 15 35 5 y yes n no 3>&1 1>&2 2>&3)
+if [ x"${MULTILIB_ENABLE}" = x'y' ]; then
+ MULTILIB_ARG="--enable-multilib"
+else
+ MULTILIB_ARG="--disable-multilib"
+fi
+
# build gccgo?
GCCGO_ENABLE=$(whiptail --clear --menu 'build gccgo?' 15 35 5 y yes n no 3>&1 1>&2 2>&3)
if [ x"${GCCGO_ENABLE}" = x'y' ]; then
@@ -139,7 +150,7 @@ cd ${BIN_BUILD}
# build binutils
../binutils-${BINUTILS_VERSION}/configure \
${MULTIARCH} \
- --disable-multilib \
+ ${MULTILIB_ARG} \
--prefix=${INSTALLDIR} \
--disable-nls \
${GCCGO_BIN} \
@@ -160,7 +171,7 @@ cd ../${GCC_BUILD}
--enable-__cxa_atexit \
--enable-clocale=gnu \
--enable-languages=c,c++${GCCGO_GCC} \
- --disable-multilib \
+ ${MULTILIB_ARG} \
--with-system-zlib \
${GCCGO_BIN} \
--enable-lto \