diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-07 07:38:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-07 07:38:37 -0700 |
| commit | 1462b67bc893fc845d28e2748c20357cb16a5ce3 (patch) | |
| tree | 0acfb6df2e641b55e8b64a0dbb789ee52e00df33 /config.mak.uname | |
| parent | 882e78c7f9c284408640347a4b1910ea73537a10 (diff) | |
| parent | 65db0443710f59a1c05a85688cdccc215ff48333 (diff) | |
| download | git-1462b67bc893fc845d28e2748c20357cb16a5ce3.tar.gz git-1462b67bc893fc845d28e2748c20357cb16a5ce3.tar.xz | |
Merge tag 'post183-for-junio' of http://github.com/msysgit/git
Collected msysgit build patches for upstream
This set of patches collects a number of build fixes that have been
used on the msysgit port for a while and merging upstream should
simplify future maintenance.
* tag 'post183-for-junio' of http://github.com/msysgit/git:
Set the default help format to html for msys builds.
Ensure the resource file is rebuilt when the version changes.
Windows resource: handle dashes in the Git version gracefully
Provide a Windows version resource for the git executables.
msysgit: Add the --large-address-aware linker directive to the makefile.
Define NO_GETTEXT for Git for Windows
Makefile: Do not use OLD_ICONV on MINGW anymore
Diffstat (limited to 'config.mak.uname')
| -rw-r--r-- | config.mak.uname | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname index 174703b67..535400758 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -481,7 +481,6 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_FNMATCH = YesPlease NO_MEMMEM = YesPlease NEEDS_LIBICONV = YesPlease - OLD_ICONV = YesPlease NO_STRTOUMAX = YesPlease NO_MKDTEMP = YesPlease NO_MKSTEMPS = YesPlease @@ -501,13 +500,17 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_INET_PTON = YesPlease NO_INET_NTOP = YesPlease NO_POSIX_GOODIES = UnfortunatelyYes + DEFAULT_HELP_FORMAT = html COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32 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 = + RC = windres -O coff NATIVE_CRLF = YesPlease X = .exe SPARSE_FLAGS = -Wno-one-bit-signed-bitfield @@ -519,6 +522,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) NO_R_TO_GCC_LINKER = YesPlease INTERNAL_QSORT = YesPlease HAVE_LIBCHARSET_H = YesPlease + NO_GETTEXT = YesPlease else NO_CURL = YesPlease endif |