github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Partially fix Windows build with go-compile

Browse Source 
Fix go-compile to not use buildmode pie for Windows.

See #1863

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-05-20 10:57:48 +01:00
parent a81a48629b
commit fc69bcf288
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ all: default
VERSION="0.0" # dummy for now VERSION="0.0" # dummy for now
GIT_COMMIT=$(shell git rev-list -1 HEAD) GIT_COMMIT=$(shell git rev-list -1 HEAD)
GO_COMPILE=linuxkit/go-compile:5bf17af781df44f07906099402680b9a661f999b GO_COMPILE=linuxkit/go-compile:3ba94f14de51b73551417e769d122815ec917ee7
MOBY?=bin/moby MOBY?=bin/moby
LINUXKIT?=bin/linuxkit LINUXKIT?=bin/linuxkit

2
tools/go-compile/compile.sh
View File

@ -88,7 +88,7 @@ test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*
>&2 echo "go build..." >&2 echo "go build..."
if [ "$GOOS" = "darwin" ] if [ "$GOOS" = "darwin" -o "$GOOS" = "windows" ]
then then
if [ -z "$ldflags" ] if [ -z "$ldflags" ]
then then