diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-03 19:47:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-03 19:47:46 -0800 |
| commit | 253e772edeb56092e0fad43ec0640658671313c5 (patch) | |
| tree | 8e9278a4ac03353056acd765c04779e01b0ce2f9 /Makefile | |
| parent | 4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c (diff) | |
| parent | 7943b3a94f0f862dc9d7dcec6b5639ae5bf027bd (diff) | |
| download | git-253e772edeb56092e0fad43ec0640658671313c5.tar.gz git-253e772edeb56092e0fad43ec0640658671313c5.tar.xz | |
Merge branch 'maint'
* maint:
Unset NO_C99_FORMAT on Cygwin.
Fix a "pointer type missmatch" warning.
Fix some "comparison is always true/false" warnings.
Fix an "implicit function definition" warning.
Fix a "label defined but unreferenced" warning.
Document the config variable format.suffix
git-merge: fail correctly when we cannot fast forward.
builtin-archive: use RUN_SETUP
Fix git-gc usage note
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -89,6 +89,9 @@ all:: # # Define NO_ICONV if your libc does not properly support iconv. # +# Define OLD_ICONV if your library has an old iconv(), where the second +# (input buffer pointer) parameter is declared with type (const char **). +# # Define NO_R_TO_GCC if your gcc does not like "-R/path/lib" that # tells runtime paths to dynamic libraries; "-Wl,-rpath=/path/lib" # is used instead. @@ -378,7 +381,6 @@ ifeq ($(uname_O),Cygwin) NO_STRCASESTR = YesPlease NO_SYMLINK_HEAD = YesPlease NEEDS_LIBICONV = YesPlease - NO_C99_FORMAT = YesPlease NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes NO_TRUSTABLE_FILEMODE = UnfortunatelyYes # There are conflicting reports about this. @@ -576,6 +578,10 @@ ifdef NO_ICONV BASIC_CFLAGS += -DNO_ICONV endif +ifdef OLD_ICONV + BASIC_CFLAGS += -DOLD_ICONV +endif + ifdef PPC_SHA1 SHA1_HEADER = "ppc/sha1.h" LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o |