diff options
| author | davidovski <david@davidovski.xyz> | 2023-05-18 15:47:07 +0100 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2023-05-18 15:47:07 +0100 |
| commit | b9fc4f41e38eaa6d27652d418b983d40d13ef82c (patch) | |
| tree | 1928df6cb290b8411bcad275195f7f7b5941162d | |
| parent | 0d37a1ef234c38b27faba43bc3a22f985d311deb (diff) | |
Fix go build for 1.20 and bump gomuks
| -rw-r--r-- | repo/go/go.xibuild | 14 | ||||
| -rw-r--r-- | repo/gomuks/gomuks.xibuild | 2 |
2 files changed, 4 insertions, 12 deletions
diff --git a/repo/go/go.xibuild b/repo/go/go.xibuild index 585a2d0..62dfaa1 100644 --- a/repo/go/go.xibuild +++ b/repo/go/go.xibuild @@ -18,28 +18,20 @@ prepare () { export TMPDIR=/tmp tar -xvf $BOOTSTRAP.tbz mv go-linux-amd64-bootstrap $BOOTSTRAP + + git init . } build () { - export sourceroot=$(pwd) export GOARCH=amd64 export GOAMD64=v1 # make sure we're building for the right x86-64 version export GOOS="linux" - cd $BOOTSTRAP - cd src - echo "~~~~BUILDING BOOTSTRAP" - CGO_ENABLED=0 ./make.bash -v || return 1 - - cd $sourceroot export GOROOT_BOOTSTRAP="$(pwd)/$BOOTSTRAP" echo "~~~~BUILDING GOLANG" cd src - if [ ! -z "${GOROOT_BOOTSTRAP}" ]; then - ./bootstrap.bash -v || return 1 - fi - ./make.bash -v || reutrn 1 + ./make.bash -v || return 1 cd .. } diff --git a/repo/gomuks/gomuks.xibuild b/repo/gomuks/gomuks.xibuild index fac64d6..0c50ed5 100644 --- a/repo/gomuks/gomuks.xibuild +++ b/repo/gomuks/gomuks.xibuild @@ -9,7 +9,7 @@ PKG_VER=0.3.0 SOURCE="https://github.com/tulir/gomuks/archive/v$PKG_VER.tar.gz" build() { - go build + go build -buildvcs=false } package() { |