diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-02-07 02:46:06 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-02-07 13:05:37 -0800 |
| commit | 3815f64b0dd983bdbf9242a0547706d5d81cb3e6 (patch) | |
| tree | 249e7c2f424ef272c496e7afcf51ff377d71ad88 | |
| parent | Git 2.20.1 (diff) | |
| download | tgif-3815f64b0dd983bdbf9242a0547706d5d81cb3e6.tar.xz | |
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>
| -rw-r--r-- | compat/mingw.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 8c24ddaa3e..363f047df0 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -6,6 +6,25 @@ typedef _sigset_t sigset_t; #include <winsock2.h> #include <ws2tcpip.h> +#ifdef __MINGW64_VERSION_MAJOR +/* + * In Git for Windows, we cannot rely on `uname -m` to report the correct + * architecture: /usr/bin/uname.exe will report the architecture with which the + * current MSYS2 runtime was built, not the architecture for which we are + * currently compiling (both 32-bit and 64-bit `git.exe` is built in the 64-bit + * Git for Windows SDK). + */ +#undef GIT_HOST_CPU +/* This was figured out by looking at `cpp -dM </dev/null`'s output */ +#if defined(__x86_64__) +#define GIT_HOST_CPU "x86_64" +#elif defined(__i686__) +#define GIT_HOST_CPU "i686" +#else +#error "Unknown architecture" +#endif +#endif + /* MinGW-w64 reports to have flockfile, but it does not actually have it. */ #ifdef __MINGW64_VERSION_MAJOR #undef _POSIX_THREAD_SAFE_FUNCTIONS |