Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

windows: remove workaround for go#15286 and have compiling work on windows 

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2017-04-25 15:44:34 -07:00
parent b37ea22b1e
commit 97a4da4cf1
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/docker/docker_autogen_windows.go Normal file
View File

@ -0,0 +1,8 @@
// +build autogen,windows
package main
// TODO: add build scripts that include the winresources (for docker icon etc.)
// Those scripts will need to specify an autogen buildtag.
import _ "github.com/docker/cli/autogen/winresources"

18
cmd/docker/docker_windows.go
View File

@ -1,18 +0,0 @@
package main
import (
"sync/atomic"
_ "github.com/docker/cli/autogen/winresources"
)
//go:cgo_import_dynamic main.dummy CommandLineToArgvW%2 "shell32.dll"
var dummy uintptr
func init() {
// Ensure that this import is not removed by the linker. This is used to
// ensure that shell32.dll is loaded by the system loader, preventing
// go#15286 from triggering on Nano Server TP5.
atomic.LoadUintptr(&dummy)
}