mingw: fix CPU reporting in `git version --build-options`
We cannot rely on `uname -m` in Git for Windows' SDK to tell us what architecture we are compiling for, as we can compile both 32-bit and 64-bit `git.exe` from a 64-bit SDK, but the `uname -m` in that SDK will always report `x86_64`. So let's go back to our original design. And make it explicitly Windows-specific. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Feb 7, 2019 at 02:46 UTC
3815f64b0dd983bdbf9242a0547706d5d81cb3e6
1 file changed
+19
compat/mingw.h
+19
@@ -6,6 +6,25 @@ typedef _sigset_t sigset_t;
6
#include <winsock2.h>
7
#include <ws2tcpip.h>
8
9
+#ifdef __MINGW64_VERSION_MAJOR
10
+/*
11
+ * In Git for Windows, we cannot rely on `uname -m` to report the correct
12
+ * architecture: /usr/bin/uname.exe will report the architecture with which the
13
+ * current MSYS2 runtime was built, not the architecture for which we are
14
+ * currently compiling (both 32-bit and 64-bit `git.exe` is built in the 64-bit
15
+ * Git for Windows SDK).
16
+ */
17
+#undef GIT_HOST_CPU
18
+/* This was figured out by looking at `cpp -dM </dev/null`'s output */
19
+#if defined(__x86_64__)
20
+#define GIT_HOST_CPU "x86_64"
21
+#elif defined(__i686__)
22
+#define GIT_HOST_CPU "i686"
23
+#else
24
+#error "Unknown architecture"
25
+#endif
26
+#endif
27
+
28
/* MinGW-w64 reports to have flockfile, but it does not actually have it. */
29
#ifdef __MINGW64_VERSION_MAJOR
30
#undef _POSIX_THREAD_SAFE_FUNCTIONS