Marat Radchenko <marat@xxxxxxxxxxxxxxxx> writes: > Subject: Re: [PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64 Please prefix with MinGW: like you did for other changes. > From: Ray Donnelly <mingw.android@xxxxxxxxx> Needs a bit of explanation what breaks without this change. I can see that unconditional use of USE_32BIT_TIME_T probably goes against a 64-bit platform by looking at the change, but "Fix Blah" is never informative enough to justify any change in the log message. We want to be able to read "Fix Blah *how*/*why*" in our "git log" (and prefereably in "git shortlog"). Thanks. > Signed-off-by: Ray Donnelly <mingw.android@xxxxxxxxx> > Signed-off-by: Marat Radchenko <marat@xxxxxxxxxxxxxxxx> > --- > config.mak.uname | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/config.mak.uname b/config.mak.uname > index 324a7fc..4470a928 100644 > --- a/config.mak.uname > +++ b/config.mak.uname > @@ -6,6 +6,7 @@ uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') > uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') > uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') > uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') > +CC_MACH := $(shell sh -c '$(CC) -dumpmachine 2>/dev/null || echo not') > > ifdef MSVC > # avoid the MingW and Cygwin configuration sections > @@ -509,12 +510,15 @@ ifneq (,$(findstring MINGW,$(uname_S))) > NO_POSIX_GOODIES = UnfortunatelyYes > DEFAULT_HELP_FORMAT = html > NO_D_INO_IN_DIRENT = YesPlease > - COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32 > + COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32 > + ifneq (,$(findstring i686,$(CC_MACH))) > + COMPAT_CFLAGS += -D_USE_32BIT_TIME_T > + BASIC_LDFLAGS += -Wl,--large-address-aware > + endif > COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" > COMPAT_OBJS += compat/mingw.o compat/winansi.o \ > compat/win32/pthread.o compat/win32/syslog.o \ > compat/win32/dirent.o > - BASIC_LDFLAGS += -Wl,--large-address-aware > EXTLIBS += -lws2_32 > GITLIBS += git.res > PTHREAD_LIBS = > -- > 2.1.1 > > -- -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html