diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-02-13 10:19:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-13 21:46:58 (GMT) |
| commit | bb02e7a560de818eac48344717bc52ca51b01908 (patch) | |
| tree | 278a996e656180fe584f7b29a19ab74647bc8fb3 /config.mak.uname | |
| parent | 3815f64b0dd983bdbf9242a0547706d5d81cb3e6 (diff) | |
| download | git-bb02e7a560de818eac48344717bc52ca51b01908.zip git-bb02e7a560de818eac48344717bc52ca51b01908.tar.gz git-bb02e7a560de818eac48344717bc52ca51b01908.tar.bz2 | |
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 'config.mak.uname')
| -rw-r--r-- | config.mak.uname | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index 3ee7da0..194f20a 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -553,9 +553,11 @@ else prefix = /usr/ ifeq (MINGW32,$(MSYSTEM)) prefix = /mingw32 + HOST_CPU = i686 endif ifeq (MINGW64,$(MSYSTEM)) prefix = /mingw64 + HOST_CPU = x86_64 else COMPAT_CFLAGS += -D_USE_32BIT_TIME_T BASIC_LDFLAGS += -Wl,--large-address-aware |