1. docker
  2. Commit 25a1bf53d29e6424d4e9688952129a03c62fdef6
Browse code

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 <x86intrin.h>
^~~~~~~~~~~~~
compilation terminated.
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2020/01/07 21:50:06
Showing 1 changed files
hack/make/containerutility
History View file @ 25a1bf5
... ... 
@@ -8,6 +8,13 @@ CONTAINER_UTILITY_COMMIT=e004a1415a433447369e315b9d7df357102be0d2 # v0.9.0
8 8 
 	cd "$GOPATH/src/github.com/docker/windows-container-utility"
9 9 
 	git checkout -q "$CONTAINER_UTILITY_COMMIT"
10 10
11 
+	# TODO remove this temporary fix once https://github.com/docker/windows-container-utility/pull/2 is merged
12 
+	sed -i \
13 
+		-e 's|-nostdinc ||g' \
14 
+		-e 's|-I/usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/include ||g' \
15 
+		-e 's|-I/usr/x86_64-w64-mingw32/include ||g' \
16 
+		"$GOPATH/src/github.com/docker/windows-container-utility/Makefile"
17 
+
11 18 
 	echo Building: ${DEST}/containerutility.exe
12 19
13 20 
 	(