Skip to content

Commit e65921a

Browse files
committed
unix/linux: use Go 1.19rc2 instead of building gotip
CL 399336 added support for generating linux/loong64 types and constants and CL 406794 switched it to use gotip after support for linux/loong64 was merged. The upcoming Go 1.19 release will support that platform, so switch to use 1.19rc2. Change-Id: Id3be69eb8f04bdf215f248df09bb5da9456494e7 Reviewed-on: https://go-review.googlesource.com/c/sys/+/419395 Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Cherry Mui <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 8c9f86f commit e65921a

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Diff for: unix/linux/Dockerfile

+2-8
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ RUN git clone https://github.com/loongson/golang-infra.git /git/loong64-patches
2727
&& curl -fsSL https://git.savannah.gnu.org/cgit/config.git/plain/config.sub -o /git/glibc/scripts/config.sub
2828

2929
# Get Go
30-
ENV GOLANG_VERSION 1.18
30+
ENV GOLANG_VERSION 1.19rc2
3131
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
32-
ENV GOLANG_DOWNLOAD_SHA256 e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f
32+
ENV GOLANG_DOWNLOAD_SHA256 9130c6f8e87ce9bb4813533a68c3f17c82c7307caf8795d3c9427652b77f81aa
3333

3434
RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
3535
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
@@ -57,12 +57,6 @@ RUN apt-get update && apt-get install -y \
5757
&& apt-get clean \
5858
&& rm -rf /var/lib/apt/lists/*
5959

60-
# Only for loong64, build Go from master until 1.19 is released
61-
RUN git clone https://go.googlesource.com/go --branch master /git/go \
62-
&& cd /git/go/src && ./make.bash
63-
64-
ENV PATH /git/go/bin:$PATH
65-
6660
# Only for loong64, getting tools of qemu-user and gcc-cross-compiler
6761
RUN apt-get update && apt-get install wget xz-utils -y && mkdir /loong64 && cd /loong64 \
6862
&& wget -q https://github.com/loongson/build-tools/releases/download/2021.12.21/qemu-loongarch-2022-4-01.tar.gz \

0 commit comments

Comments
 (0)