Skip to content

Commit 42e9d7b

Browse files
committed
wrappers: remove musl Go tree selection
Remove GOLIBC=musl handling from go and gofips wrappers since separate musl Go trees are no longer needed without AWS-LC syso files. Signed-off-by: Jingwei Wang <[email protected]>
1 parent 1e01183 commit 42e9d7b

File tree

4 files changed

+0
-21
lines changed

4 files changed

+0
-21
lines changed

wrappers/go/go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,4 @@ if [ -n "${GO_VERSION:-}" ] ; then
1010
GO_MAJOR="${GO_VERSION%.*}"
1111
fi
1212

13-
# prefer the musl flavor if GOLIBC indicates that we should
14-
if [ "${GOLIBC:-}" = "musl" ] ; then
15-
GO_MAJOR+="-musl"
16-
fi
17-
1813
exec /usr/libexec/go-"${GO_MAJOR}"/bin/go "${@}"

wrappers/go/go-latest

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,4 @@ if [ -z "${LATEST_GO}" ]; then
1212
exit 1
1313
fi
1414

15-
# prefer the musl flavor if GOLIBC indicates that we should
16-
if [ "${GOLIBC:-}" = "musl" ] ; then
17-
LATEST_GO+="-musl"
18-
fi
19-
2015
exec /usr/libexec/"${LATEST_GO}"/bin/go "${@}"

wrappers/go/gofips

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,4 @@ if [ -n "${GO_VERSION:-}" ] ; then
1010
GO_MAJOR="${GO_VERSION%.*}"
1111
fi
1212

13-
# prefer the musl flavor if GOLIBC indicates that we should
14-
if [ "${GOLIBC:-}" = "musl" ] ; then
15-
GO_MAJOR+="-musl"
16-
fi
17-
18-
export GOEXPERIMENT=boringcrypto
1913
exec /usr/libexec/go-"${GO_MAJOR}"/bin/go "${@}"

wrappers/go/gofmt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,4 @@ if [ -n "${GO_VERSION:-}" ] ; then
1010
GO_MAJOR="${GO_VERSION%.*}"
1111
fi
1212

13-
# prefer the musl flavor if GOLIBC indicates that we should
14-
if [ "${GOLIBC:-}" = "musl" ] ; then
15-
GO_MAJOR+="-musl"
16-
fi
17-
1813
exec /usr/libexec/go-"${GO_MAJOR}"/bin/gofmt "${@}"

0 commit comments

Comments
 (0)