Merge branch 'da/rhel7-lacks-uncompress2-and-c99'

[thirdparty/git.git] / config.mak.uname

diff --git a/config.mak.uname b/config.mak.uname
index 9b3e9bff5f5f8be12483a4b6001921b399373357..c48db45106c8dc0e4138ccb8ecff016f3f7d0faa 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -63,6 +63,11 @@ ifeq ($(uname_S),Linux)
        PROCFS_EXECUTABLE_PATH = /proc/self/exe
        HAVE_PLATFORM_PROCINFO = YesPlease
        COMPAT_OBJS += compat/linux/procinfo.o
+       # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
+       ifneq ($(findstring .el7.,$(uname_R)),)
+               BASIC_CFLAGS += -std=c99
+               NO_UNCOMPRESS2 = YesPlease
+       endif
 endif
 ifeq ($(uname_S),GNU/kFreeBSD)
        HAVE_ALLOCA_H = YesPlease