Browse Source

tris: fix cross-compilation and relocation

v1.2.3
Filippo Valsorda 8 years ago
committed by Peter Wu
parent
commit
831410a948
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      _dev/Makefile
  2. +2
    -2
      _dev/go.sh

+ 1
- 1
_dev/Makefile View File

@@ -1,5 +1,5 @@
GO ?= go
GOENV := $(shell $(GO) env GOOS)_$(shell $(GO) env GOARCH)
GOENV := $(shell $(GO) env GOHOSTOS)_$(shell $(GO) env GOHOSTARCH)
GOROOTINFO := $(shell $(GO) version | cut -d' ' -f 3)_$(GOENV)

.PHONY: GOROOT


+ 2
- 2
_dev/go.sh View File

@@ -4,9 +4,9 @@ set -e
BASEDIR=$(cd "$(dirname "$0")" && pwd)

make --quiet -C "$BASEDIR" go >&2
GOENV="$(go env GOOS)_$(go env GOARCH)"
GOENV="$(go env GOHOSTOS)_$(go env GOHOSTARCH)"

unset GOROOT
export GOROOT="$BASEDIR/go/$GOENV"
make --quiet -C "$BASEDIR" GOROOT GO="$BASEDIR/go/$GOENV/bin/go" >&2
export GOROOT="$BASEDIR/GOROOT/$GOENV"



Loading…
Cancel
Save