From 4c5bf57011bd4dc54f935937b61858047c2c7dc8 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Sat, 10 Jan 2015 11:49:58 +0800 Subject: [PATCH] (*)fixed cross build --- build/crosscompile.bash | 1 + build/travis-build.sh | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build/crosscompile.bash b/build/crosscompile.bash index 3375cbb..d477f3c 100644 --- a/build/crosscompile.bash +++ b/build/crosscompile.bash @@ -38,6 +38,7 @@ function go-all { for PLATFORM in $PLATFORMS; do GOOS=${PLATFORM%/*} GOARCH=${PLATFORM#*/} + GOARM=6 CMD="go-${GOOS}-${GOARCH} $@" echo "$CMD" $CMD || FAILURES="$FAILURES $PLATFORM" diff --git a/build/travis-build.sh b/build/travis-build.sh index d78db9f..45fa157 100755 --- a/build/travis-build.sh +++ b/build/travis-build.sh @@ -56,17 +56,15 @@ go_install() tar xz -C ${TMPDIR-/tmp} export GOROOT=${TMPDIR-/tmp}/go export PATH=${TMPDIR-/tmp}/go/bin/:$PATH - wget https://raw.githubusercontent.com/davecheney/golang-crosscompile/master/crosscompile.bash + #wget https://raw.githubusercontent.com/davecheney/golang-crosscompile/master/crosscompile.bash source ./crosscompile.bash go-crosscompile-build-all } go_run() { - cd $GOPATH - go-build-all - ls cd "${TRAVIS_BUILD_DIR}"; + go-build-all } prebuilt_prepare()