diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:53 -0800 |
| commit | 6951c5fd9fc221520b80de1da340918887f5803b (patch) | |
| tree | f36bee25bcb4b413a47194832743853ed2ba17a9 /compat/mingw.h | |
| parent | Merge branch 'js/fuzz-commit-graph-update' (diff) | |
| parent | mingw: fix CPU reporting in `git version --build-options` (diff) | |
| download | tgif-6951c5fd9fc221520b80de1da340918887f5803b.tar.xz | |
Merge branch 'js/mingw-host-cpu'
Windows update.
* js/mingw-host-cpu:
mingw: fix CPU reporting in `git version --build-options`
Diffstat (limited to 'compat/mingw.h')
| -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 30d9fb3e36..98407744f2 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 |