update nim
This commit is contained in:
parent
3ed56b236b
commit
2c97fd976f
|
|
@ -1,37 +0,0 @@
|
||||||
FROM xena/alpine
|
|
||||||
|
|
||||||
RUN apk add --no-cache ca-certificates
|
|
||||||
|
|
||||||
ENV GOLANG_VERSION 1.7.5
|
|
||||||
ENV GOLANG_SRC_URL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz
|
|
||||||
|
|
||||||
# https://golang.org/issue/14851
|
|
||||||
COPY no-pic.patch /
|
|
||||||
|
|
||||||
RUN set -ex \
|
|
||||||
&& apk add --no-cache --virtual go-build-deps \
|
|
||||||
bash \
|
|
||||||
gcc \
|
|
||||||
musl-dev \
|
|
||||||
openssl \
|
|
||||||
go \
|
|
||||||
\
|
|
||||||
&& export GOROOT_BOOTSTRAP="$(go env GOROOT)" \
|
|
||||||
\
|
|
||||||
&& wget -q "$GOLANG_SRC_URL" -O golang.tar.gz \
|
|
||||||
&& tar -C /usr/local -xzf golang.tar.gz \
|
|
||||||
&& rm golang.tar.gz \
|
|
||||||
&& cd /usr/local/go/src \
|
|
||||||
&& patch -p2 -i /no-pic.patch \
|
|
||||||
&& ./make.bash \
|
|
||||||
\
|
|
||||||
&& rm -rf /*.patch \
|
|
||||||
&& apk del go-build-deps
|
|
||||||
|
|
||||||
ENV GOPATH /go
|
|
||||||
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
|
|
||||||
|
|
||||||
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
|
|
||||||
WORKDIR $GOPATH
|
|
||||||
|
|
||||||
COPY go-wrapper /usr/local/bin/
|
|
||||||
|
|
@ -1,97 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
base="$(basename "$0")"
|
|
||||||
cat <<EOUSAGE
|
|
||||||
|
|
||||||
usage: $base command [args]
|
|
||||||
|
|
||||||
This script assumes that is is run from the root of your Go package (for
|
|
||||||
example, "/go/src/app" if your GOPATH is set to "/go").
|
|
||||||
|
|
||||||
In Go 1.4, a feature was introduced to supply the canonical "import path" for a
|
|
||||||
given package in a comment attached to a package statement
|
|
||||||
(https://golang.org/s/go14customimport).
|
|
||||||
|
|
||||||
This script allows us to take a generic directory of Go source files such as
|
|
||||||
"/go/src/app" and determine that the canonical "import path" of where that code
|
|
||||||
expects to live and reference itself is "github.com/jsmith/my-cool-app". It
|
|
||||||
will then ensure that "/go/src/github.com/jsmith/my-cool-app" is a symlink to
|
|
||||||
"/go/src/app", which allows us to build and run it under the proper package
|
|
||||||
name.
|
|
||||||
|
|
||||||
For compatibility with versions of Go older than 1.4, the "import path" may also
|
|
||||||
be placed in a file named ".godir".
|
|
||||||
|
|
||||||
Available Commands:
|
|
||||||
|
|
||||||
$base download
|
|
||||||
$base download -u
|
|
||||||
(equivalent to "go get -d [args] [godir]")
|
|
||||||
|
|
||||||
$base install
|
|
||||||
$base install -race
|
|
||||||
(equivalent to "go install [args] [godir]")
|
|
||||||
|
|
||||||
$base run
|
|
||||||
$base run -app -specific -arguments
|
|
||||||
(assumes "GOPATH/bin" is in "PATH")
|
|
||||||
|
|
||||||
EOUSAGE
|
|
||||||
}
|
|
||||||
|
|
||||||
# make sure there is a subcommand specified
|
|
||||||
if [ "$#" -eq 0 ]; then
|
|
||||||
usage >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
# "shift" so that "$@" becomes the remaining arguments and can be passed along to other "go" subcommands easily
|
|
||||||
cmd="$1"
|
|
||||||
shift
|
|
||||||
|
|
||||||
goDir="$(go list -e -f '{{.ImportComment}}' 2>/dev/null || true)"
|
|
||||||
|
|
||||||
if [ -z "$goDir" -a -s .godir ]; then
|
|
||||||
goDir="$(cat .godir)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
dir="$(pwd -P)"
|
|
||||||
if [ "$goDir" ]; then
|
|
||||||
goPath="${GOPATH%%:*}" # this just grabs the first path listed in GOPATH, if there are multiple (which is the detection logic "go get" itself uses, too)
|
|
||||||
goDirPath="$goPath/src/$goDir"
|
|
||||||
mkdir -p "$(dirname "$goDirPath")"
|
|
||||||
if [ ! -e "$goDirPath" ]; then
|
|
||||||
ln -sfv "$dir" "$goDirPath"
|
|
||||||
elif [ ! -L "$goDirPath" ]; then
|
|
||||||
echo >&2 "error: $goDirPath already exists but is unexpectedly not a symlink!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
goBin="$goPath/bin/$(basename "$goDir")"
|
|
||||||
else
|
|
||||||
goBin="$(basename "$dir")" # likely "app"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$cmd" in
|
|
||||||
download)
|
|
||||||
set -- go get -v -d "$@"
|
|
||||||
if [ "$goDir" ]; then set -- "$@" "$goDir"; fi
|
|
||||||
set -x; exec "$@"
|
|
||||||
;;
|
|
||||||
|
|
||||||
install)
|
|
||||||
set -- go install -v "$@"
|
|
||||||
if [ "$goDir" ]; then set -- "$@" "$goDir"; fi
|
|
||||||
set -x; exec "$@"
|
|
||||||
;;
|
|
||||||
|
|
||||||
run)
|
|
||||||
set -x; exec "$goBin" "$@"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
echo >&2 'error: unknown command:' "$cmd"
|
|
||||||
usage >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
|
|
||||||
index 14f4fa9..5599307 100644
|
|
||||||
--- a/src/cmd/link/internal/ld/lib.go
|
|
||||||
+++ b/src/cmd/link/internal/ld/lib.go
|
|
||||||
@@ -1272,6 +1272,11 @@ func hostlink() {
|
|
||||||
argv = append(argv, peimporteddlls()...)
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // The Go linker does not currently support building PIE
|
|
||||||
+ // executables when using the external linker. See:
|
|
||||||
+ // https://github.com/golang/go/issues/6940
|
|
||||||
+ argv = append(argv, "-fno-PIC")
|
|
||||||
+
|
|
||||||
if Debug['v'] != 0 {
|
|
||||||
fmt.Fprintf(Bso, "host link:")
|
|
||||||
for _, v := range argv {
|
|
||||||
Loading…
Reference in New Issue