From 244bd12857155f9c1aa2cbeabb83df83e644e851 Mon Sep 17 00:00:00 2001 From: Lode Hoste Date: Thu, 21 Aug 2014 21:35:44 +0200 Subject: [PATCH] Fix building syncthing on darwin host --- build-syncthing.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/build-syncthing.sh b/build-syncthing.sh index 6f7f8de1..7998bcb1 100755 --- a/build-syncthing.sh +++ b/build-syncthing.sh @@ -30,7 +30,7 @@ if [ -z $GOROOT ]; then popd fi # Add GO to the environment - export GOROOT="$(readlink -e $tmpgo)" + export GOROOT="$(pwd)/$tmpgo" fi # Add GO compiler to PATH @@ -58,17 +58,12 @@ export GOPATH="$(pwd)" # Install godep $GOROOT/bin/go get github.com/tools/godep -export PATH="$(readlink -e bin)":$PATH +export PATH="$(pwd)/bin":$PATH -# Install dependencies -cd src/github.com/syncthing/syncthing -./build.sh setup || true - -# Build test -#./build.sh test || exit 1 - -export GOOS=linux +# Setup syncthing and clean export ENVIRONMENT=android +cd src/github.com/syncthing/syncthing +$GOROOT/bin/go run build.go clean # X86 $GOROOT/bin/go run build.go -goos linux -goarch 386 -no-upgrade build