diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-13 18:18:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-13 18:18:43 -0800 |
| commit | 8593e8a61807df2579b9e578d46e2285b47b61a7 (patch) | |
| tree | 49de428edbb7b6693c4a74adcbff41ab9309389f /config.mak.uname | |
| parent | Merge branch 'sg/stress-test' (diff) | |
| parent | mingw: use a more canonical method to fix the CPU reporting (diff) | |
| download | tgif-8593e8a61807df2579b9e578d46e2285b47b61a7.tar.xz | |
Merge branch 'js/mingw-host-cpu'
Windows update.
* js/mingw-host-cpu:
mingw: use a more canonical method to fix the CPU reporting
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 bd55e828ca..29ed39475f 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -574,9 +574,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 |