diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-02-13 11:19:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-13 22:46:58 +0100 |
| commit | bb02e7a560de818eac48344717bc52ca51b01908 (patch) | |
| tree | 278a996e656180fe584f7b29a19ab74647bc8fb3 /compat | |
| parent | mingw: fix CPU reporting in `git version --build-options` (diff) | |
| download | git-bb02e7a560de818eac48344717bc52ca51b01908.tar.xz git-bb02e7a560de818eac48344717bc52ca51b01908.zip | |
mingw: use a more canonical method to fix the CPU reporting
In `git version --build-options`, we report also the CPU, but in Git for
Windows we actually cross-compile the 32-bit version in a 64-bit Git for
Windows, so we cannot rely on the auto-detected value.
In 3815f64b0dd9 (mingw: fix CPU reporting in `git version
--build-options`, 2019-02-07), we fixed this by a Windows-only
workaround, making use of magic pre-processor constants, which works in
GCC, but most likely not all C compilers.
As pointed out by Eric Sunshine, there is a better way, anyway: to set
the Makefile variable HOST_CPU explicitly for cross-compiled Git. So
let's do that!
This reverts commit 3815f64b0dd983bdbf9242a0547706d5d81cb3e6 partially.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 363f047df0..8c24ddaa3e 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -6,25 +6,6 @@ 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 |