Skip to content

Commit d697e49

Browse files
authored
Merge pull request #2614 from hashicorp/b-2343-windows-panic
Update go-winio to fix Go 1.8 compat
2 parents c58f9fe + c9a8a0c commit d697e49

File tree

9 files changed

+94
-42
lines changed

9 files changed

+94
-42
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ BUG FIXES:
2323
* client/artifact: Handle tars where file in directory is listed before
2424
directory [GH-2524]
2525
* driver/exec: Properly set file/dir ownership in chroots [GH-2552]
26+
* driver/docker: Fix panic in Docker driver on Windows [GH-2614]
2627
* server: Reject non-TLS clients when TLS enabled [GH-2525]
2728
* server: Fix a panic in plan evaluation with partial failures and all_at_once
2829
set [GH-2544]

Vagrantfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential curl git-
2020
liblxc1 lxc-dev lxc-templates \
2121
gcc-5-aarch64-linux-gnu binutils-aarch64-linux-gnu \
2222
libc6-dev-i386 linux-libc-dev:i386 \
23-
gcc-5-arm-linux-gnueabihf gcc-5-multilib-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
23+
gcc-5-arm-linux-gnueabihf gcc-5-multilib-arm-linux-gnueabihf binutils-arm-linux-gnueabihf \
24+
gcc-mingw-w64 binutils-mingw-w64
2425
2526
# Setup go, for development of Nomad
2627
SRCROOT="/opt/go"

scripts/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ for target in $targets; do
6464
;;
6565
"windows_386")
6666
echo "==> Building windows 386..."
67-
CGO_ENABLED=1 GOARCH="386" GOOS="windows" go build -ldflags "-X $LDFLAG" -o "pkg/windows_386/nomad.exe"
67+
CGO_ENABLED=1 CXX=i686-w64-mingw32-g++ CC=i686-w64-mingw32-gcc GOARCH="386" GOOS="windows" go build -ldflags "-X $LDFLAG" -o "pkg/windows_386/nomad.exe"
6868
;;
6969
"windows_amd64")
7070
echo "==> Building windows amd64..."
71-
CGO_ENABLED=1 GOARCH="amd64" GOOS="windows" go build -ldflags "-X $LDFLAG" -o "pkg/windows_amd64/nomad.exe"
71+
CGO_ENABLED=1 CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc GOARCH="amd64" GOOS="windows" go build -ldflags "-X $LDFLAG" -o "pkg/windows_amd64/nomad.exe"
7272
;;
7373
"darwin_amd64")
7474
echo "==> Building darwin amd64..."

vendor/github.com/Microsoft/go-winio/backup.go

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/go-winio/file.go

+14-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/go-winio/fileinfo.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/go-winio/pipe.go

+14-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)