Merge pull request #399 from Zillode/fix-toolchain

Build toolchain with 387 and ARMv5 support (fixes #336)
This commit is contained in:
Felix Ableitner 2015-05-25 17:15:06 +02:00
commit 8e207ea66c
1 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@ ORIG=$(pwd)
mkdir -p bin mkdir -p bin
# Load submodules # Load submodules
if [ ! -f "ext/syncthing/src/github.com/syncthing/syncthing/.git" ]; then if [ ! -e "ext/syncthing/src/github.com/syncthing/syncthing/.git" ]; then
git submodule update --init --recursive git submodule update --init --recursive
fi fi
@ -26,7 +26,7 @@ if [ -z $GOROOT ] || [[ $(go version) != go\ version\ go1.4* ]] ; then
rm go.src.tar.gz rm go.src.tar.gz
# Build GO for host # Build GO for host
pushd $tmpgo/src pushd $tmpgo/src
./make.bash --no-clean GO386=387 GOARM=5 ./make.bash --no-clean
popd popd
fi fi
# Add GO to the environment # Add GO to the environment
@ -50,7 +50,7 @@ fi
if [ ! -f $GOROOT/bin/linux_arm/go ]; then if [ ! -f $GOROOT/bin/linux_arm/go ]; then
pushd $GOROOT/src pushd $GOROOT/src
# Build GO for cross-compilation # Build GO for cross-compilation
GOOS=linux GOARCH=arm ./make.bash --no-clean GOOS=linux GOARCH=arm GOARM=5 ./make.bash --no-clean
popd popd
fi fi