Skip to content

Commit 5e4e11f

Browse files
tklausergopherbot
authored andcommitted
unix/linux: use gotip instead of patched Go 1.18
CL 399336 added support for generating linux/loong64 types and constants by using a patched version of Go 1.18. The necessary changes have since been submitted to gotip, so use Go build from the master branch to generate types and consts. The changes in the cgo -godefs generated comments are due to CL 396936, also see go.dev/issue/52063 Change-Id: I314156675e79ba77b9eb1fa1845b20ca974ec77a Reviewed-on: https://go-review.googlesource.com/c/sys/+/406794 Reviewed-by: Ian Lance Taylor <[email protected]> Reviewed-by: Michael Knyszek <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> Run-TryBot: Tobias Klauser <[email protected]>
1 parent 45d2b45 commit 5e4e11f

31 files changed

+33
-34
lines changed

unix/linux/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,9 @@ RUN apt-get update && apt-get install -y \
5858
&& apt-get clean \
5959
&& rm -rf /var/lib/apt/lists/*
6060

61-
# Only for loong64, add patch and build golang
62-
RUN git clone https://go.googlesource.com/go --branch go1.18 /git/go \
63-
&& cd /git/loong64-patches && git checkout go-v1.18 && cd /git/go && git am /git/loong64-patches/*.patch \
64-
&& rm -rf /git/loong64-patches && cd /git/go/src && ./make.bash
61+
# Only for loong64, build Go from master until 1.19 is released
62+
RUN git clone https://go.googlesource.com/go --branch master /git/go \
63+
&& cd /git/go/src && ./make.bash
6564

6665
ENV PATH /git/go/bin:$PATH
6766

unix/zerrors_linux_386.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_amd64.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_arm.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_arm64.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_loong64.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_mips.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_mips64.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_mips64le.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/zerrors_linux_mipsle.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)