diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-17 23:15:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-17 23:15:59 (GMT) |
| commit | b56bd95bbc8f716cb8cbb5fdc18b9b0f00323c6a (patch) | |
| tree | 145d1eb4b7f2159e587757aa705c3b1da82ad4bc | |
| parent | df3c41adeb212432c53d93ce6ace5d5374dc6e11 (diff) | |
| parent | ffb9f2980902d23a5640435306031bc298eb4e02 (diff) | |
| download | git-b56bd95bbc8f716cb8cbb5fdc18b9b0f00323c6a.zip git-b56bd95bbc8f716cb8cbb5fdc18b9b0f00323c6a.tar.gz git-b56bd95bbc8f716cb8cbb5fdc18b9b0f00323c6a.tar.bz2 | |
Merge branch 'da/rhel7-lacks-uncompress2-and-c99'
Adjust build on RHEL 7 to explicitly ask C99 support and use
the fallback implementation of uncompress2 we ship.
* da/rhel7-lacks-uncompress2-and-c99:
build: centos/RHEL 7 ships with an older gcc and zlib
| -rw-r--r-- | config.mak.uname | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index 9b3e9bf..c48db45 100644 --- 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 |