mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

mingw: fix CPU reporting in git version --build-options

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2019-02-07 02:46:06 -08:00 committed by Junio C Hamano
parent 0d0ac3826a
commit 3815f64b0d
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compat/mingw.h
View File

@ -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