Merge branch 'jk/grep-binary-attribute' into maint

diff --git a/Makefile b/Makefile
index ceb9dfc87d4a716518e856ab6305609af835a41d..3815f66c41525df04005f3ad00e6175fc235cc64 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -339,7 +339,7 @@ pathsep = :
 
 export prefix bindir sharedir sysconfdir gitwebdir localedir
 
-CC = gcc
+CC = cc
 AR = ar
 RM = rm -f
 DIFF = diff
@@ -452,6 +452,9 @@ PROGRAM_OBJS += http-backend.o
 PROGRAM_OBJS += sh-i18n--envsubst.o
 PROGRAM_OBJS += credential-store.o
 
+# Binary suffix, set to .exe for Windows builds
+X =
+
 PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
 
 TEST_PROGRAMS_NEED_X += test-chmtime
@@ -1775,16 +1778,18 @@ endif
 # data gathering
 PROFILE_DIR := $(CURDIR)
 
-ifeq "$(PROFILE)" "GEN"
+ifeq ("$(PROFILE)","GEN")
        CFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1
        EXTLIBS += -lgcov
        export CCACHE_DISABLE=t
        V=1
-else ifneq "$(PROFILE)" ""
+else
+ifneq ("$(PROFILE)","")
        CFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1
        export CCACHE_DISABLE=t
        V=1
 endif
+endif
 
 # Shell quote (do not use $(call) to accommodate ancient setups);