mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/mingw-host-cpu'
Windows update. * js/mingw-host-cpu: mingw: use a more canonical method to fix the CPU reporting
This commit is contained in:
commit
8593e8a618
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue