let configure find the build & host settings on Raspberry Pi

Author: PaulStoffregen

build-prerequisites.sh

@@ -35,6 +35,13 @@ umask 022
 
 exec < /dev/null
 
+
+# Added for Raspberry Pi
+LIBRARY_PATH=/usr/lib/$(gcc -print-multiarch)
+CPATH=/usr/include/$(gcc -print-multiarch)
+export LIBRARY_PATH CPATH
+
+
 script_path=`cd $(dirname $0) && pwd -P`
 . $script_path/build-common.sh
 
@@ -89,8 +96,8 @@ echo Task [I-1] /$HOST_NATIVE/gmp/
 rm -rf $BUILDDIR_NATIVE/gmp && mkdir -p $BUILDDIR_NATIVE/gmp 
 pushd $BUILDDIR_NATIVE/gmp
 
-CPPFLAGS="-fexceptions" $SRCDIR/$GMP/configure --build=$BUILD \
-    --host=$HOST_NATIVE \
+# for Raspberry Pi, let configure find the build and host settings
+CPPFLAGS="-fexceptions" $SRCDIR/$GMP/configure \
     --prefix=$BUILDDIR_NATIVE/host-libs/usr \
     --enable-cxx \
     --disable-shared \
@@ -105,8 +112,8 @@ echo Task [I-2] /$HOST_NATIVE/mpfr/
 rm -rf $BUILDDIR_NATIVE/mpfr && mkdir -p $BUILDDIR_NATIVE/mpfr
 pushd $BUILDDIR_NATIVE/mpfr
 
-$SRCDIR/$MPFR/configure --build=$BUILD \
-    --host=$HOST_NATIVE \
+# for Raspberry Pi, let configure find the build and host settings
+$SRCDIR/$MPFR/configure \
     --target=$TARGET \
     --prefix=$BUILDDIR_NATIVE/host-libs/usr \
     --disable-shared \
@@ -122,8 +129,8 @@ echo Task [I-3] /$HOST_NATIVE/mpc/
 rm -rf $BUILDDIR_NATIVE/mpc && mkdir -p $BUILDDIR_NATIVE/mpc 
 pushd $BUILDDIR_NATIVE/mpc 
 
-$SRCDIR/$MPC/configure --build=$BUILD \
-    --host=$HOST_NATIVE \
+# for Raspberry Pi, let configure find the build and host settings
+$SRCDIR/$MPC/configure \
     --target=$TARGET \
     --prefix=$BUILDDIR_NATIVE/host-libs/usr \
     --disable-shared \
@@ -140,8 +147,8 @@ echo Task [I-4] /$HOST_NATIVE/isl/
 rm -rf $BUILDDIR_NATIVE/isl && mkdir -p $BUILDDIR_NATIVE/isl
 pushd $BUILDDIR_NATIVE/isl
 
-$SRCDIR/$ISL/configure --build=$BUILD \
-    --host=$HOST_NATIVE \
+# for Raspberry Pi, let configure find the build and host settings
+$SRCDIR/$ISL/configure \
     --target=$TARGET \
     --prefix=$BUILDDIR_NATIVE/host-libs/usr \
     --disable-shared \
@@ -157,8 +164,8 @@ echo Task [I-5] /$HOST_NATIVE/cloog/
 rm -rf $BUILDDIR_NATIVE/cloog && mkdir -p $BUILDDIR_NATIVE/cloog
 pushd $BUILDDIR_NATIVE/cloog
 
-$SRCDIR/$CLOOG/configure --build=$BUILD \
-    --host=$HOST_NATIVE \
+# for Raspberry Pi, let configure find the build and host settings
+$SRCDIR/$CLOOG/configure \
     --target=$TARGET \
     --prefix=$BUILDDIR_NATIVE/host-libs/usr \
     --disable-shared \
@@ -177,8 +184,8 @@ echo Task [I-6] /$HOST_NATIVE/libelf/
 rm -rf $BUILDDIR_NATIVE/libelf && mkdir -p $BUILDDIR_NATIVE/libelf
 pushd $BUILDDIR_NATIVE/libelf
 
-$SRCDIR/$LIBELF/configure --build=$BUILD \
-    --host=$HOST_NATIVE \
+# for Raspberry Pi, let configure find the build and host settings
+$SRCDIR/$LIBELF/configure \
     --target=$TARGET \
     --prefix=$BUILDDIR_NATIVE/host-libs/usr \
     --disable-shared \
@@ -193,8 +200,8 @@ echo Task [I-7] /$HOST_NATIVE/expat/
 rm -rf $BUILDDIR_NATIVE/expat && mkdir -p $BUILDDIR_NATIVE/expat
 pushd $BUILDDIR_NATIVE/expat
 
-$SRCDIR/$EXPAT/configure --build=$BUILD \
-    --host=$HOST_NATIVE \
+# for Raspberry Pi, let configure find the build and host settings
+$SRCDIR/$EXPAT/configure \
     --target=$TARGET \
     --prefix=$BUILDDIR_NATIVE/host-libs/usr \
     --disable-shared \
@@ -204,6 +211,11 @@ make -j$JOBS
 make install
 popd
 
+
+# for Raspberry Pi, always skip mingw32
+exit 0
+
+
 # skip building mingw32 toolchain if "--skip_mingw32" specified
 if [ "x$skip_mingw32" == "xyes" ] ; then
     exit 0

build-toolchain.sh

@@ -51,7 +51,7 @@ fi
 skip_mingw32=no
 DEBUG_BUILD_OPTIONS=
 is_ppa_release=no
-skip_manual=no
+skip_manual=yes
 MULTILIB_LIST="--with-multilib-list=armv6-m,armv7-m,armv7e-m,armv7-r"
 for ac_arg; do
     case $ac_arg in
@@ -84,8 +84,8 @@ if [ "x$is_ppa_release" != "xyes" ]; then
   ENV_LDFLAGS=" -L$BUILDDIR_NATIVE/host-libs/zlib/lib
                 -L$BUILDDIR_NATIVE/host-libs/usr/lib "
 
-  GCC_CONFIG_OPTS=" --build=$BUILD --host=$HOST_NATIVE
-                    --with-gmp=$BUILDDIR_NATIVE/host-libs/usr
+# for Raspberry Pi, let configure find the build and host settings
+  GCC_CONFIG_OPTS=" --with-gmp=$BUILDDIR_NATIVE/host-libs/usr
                     --with-mpfr=$BUILDDIR_NATIVE/host-libs/usr
                     --with-mpc=$BUILDDIR_NATIVE/host-libs/usr
                     --with-isl=$BUILDDIR_NATIVE/host-libs/usr