Merge pull request #94 from japaric/freebsd32

linux-cross: install toochain for 32-bit freebsd

Author: alexcrichton

slaves/linux-cross/Dockerfile

@@ -117,7 +117,8 @@ RUN                                                                           \
   done
 
 COPY linux-cross/build_freebsd_toolchain.sh /tmp/
-RUN bash /tmp/build_freebsd_toolchain.sh
+RUN bash /tmp/build_freebsd_toolchain.sh i686
+RUN bash /tmp/build_freebsd_toolchain.sh x86_64
 COPY linux-cross/build_netbsd_toolchain.sh /tmp/
 RUN bash /tmp/build_netbsd_toolchain.sh
 
@@ -129,6 +130,9 @@ ENV AR_armv7_unknown_linux_gnueabihf=armv7-linux-gnueabihf-ar \
     AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-ar \
     CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-gcc \
     CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-g++ \
+    AR_i686_unknown_freebsd=i686-unknown-freebsd10-ar \
+    CC_i686_unknown_freebsd=i686-unknown-freebsd10-gcc \
+    CXX_i686_unknown_freebsd=i686-unknown-freebsd10-g++ \
     AR_x86_64_unknown_netbsd=x86_64-unknown-netbsd-ar \
     CC_x86_64_unknown_netbsd=x86_64-unknown-netbsd-gcc \
     CXX_x86_64_unknown_netbsd=x86_64-unknown-netbsd-g++ \

slaves/linux-cross/build_freebsd_toolchain.sh

@@ -2,6 +2,7 @@
 
 set -ex
 
+ARCH=$1
 BINUTILS=2.25.1
 GCC=5.3.0
 
@@ -13,7 +14,7 @@ curl https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS.tar.bz2 | tar xjf -
 mkdir binutils-build
 cd binutils-build
 ../binutils-$BINUTILS/configure \
-  --target=x86_64-unknown-freebsd10
+  --target=$ARCH-unknown-freebsd10
 make -j10
 make install
 cd ../..
@@ -22,10 +23,17 @@ rm -rf binutils
 # Next, download the FreeBSD libc and relevant header files
 
 mkdir freebsd
-curl ftp://ftp.freebsd.org/pub/FreeBSD/releases/amd64/10.2-RELEASE/base.txz | \
-  tar xJf - -C freebsd ./usr/include ./usr/lib ./lib
+case "$ARCH" in
+    x86_64)
+        URL=ftp://ftp.freebsd.org/pub/FreeBSD/releases/amd64/10.2-RELEASE/base.txz
+        ;;
+    i686)
+        URL=ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/10.2-RELEASE/base.txz
+        ;;
+esac
+curl $URL | tar xJf - -C freebsd ./usr/include ./usr/lib ./lib
 
-dst=/usr/local/x86_64-unknown-freebsd10
+dst=/usr/local/$ARCH-unknown-freebsd10
 
 cp -r freebsd/usr/include $dst/
 cp freebsd/usr/lib/crt1.o $dst/lib
@@ -61,7 +69,7 @@ mkdir ../gcc-build
 cd ../gcc-build
 ../gcc-$GCC/configure                            \
   --enable-languages=c,c++                       \
-  --target=x86_64-unknown-freebsd10              \
+  --target=$ARCH-unknown-freebsd10               \
   --disable-multilib                             \
   --disable-nls                                  \
   --disable-libgomp                              \