From 25a1bf53d29e6424d4e9688952129a03c62fdef6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 7 Jan 2020 13:50:06 +0100 Subject: [PATCH] Fix containerutility compilation on gcc-mingw-w64 8.3 The makefile for this binary has version 6.3 hardcoded, which causes compilation on 8.3 to fail: ``` Building: bundles/cross/windows/amd64/containerutility.exe In file included from /usr/x86_64-w64-mingw32/include/minwindef.h:163, from /usr/x86_64-w64-mingw32/include/windef.h:8, from /usr/x86_64-w64-mingw32/include/windows.h:69, from containerutility.h:3, from argumentstream.cpp:1: /usr/x86_64-w64-mingw32/include/winnt.h:1554:11: fatal error: x86intrin.h: No such file or directory # include ^~~~~~~~~~~~~ compilation terminated. ``` Signed-off-by: Sebastiaan van Stijn --- hack/make/containerutility | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hack/make/containerutility b/hack/make/containerutility index 8aefc00ff0..7dcf5ea02b 100644 --- a/hack/make/containerutility +++ b/hack/make/containerutility @@ -8,6 +8,13 @@ CONTAINER_UTILITY_COMMIT=e004a1415a433447369e315b9d7df357102be0d2 # v0.9.0 cd "$GOPATH/src/github.com/docker/windows-container-utility" git checkout -q "$CONTAINER_UTILITY_COMMIT" + # TODO remove this temporary fix once https://github.com/docker/windows-container-utility/pull/2 is merged + sed -i \ + -e 's|-nostdinc ||g' \ + -e 's|-I/usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/include ||g' \ + -e 's|-I/usr/x86_64-w64-mingw32/include ||g' \ + "$GOPATH/src/github.com/docker/windows-container-utility/Makefile" + echo Building: ${DEST}/containerutility.exe (