@@ -543,6 +543,7 @@ export prefix bindir sharedir sysconfdir gitwebdir perllibdir localedir
543543
544544# Set our default programs
545545CC = cc
546+ LD = cc
546547AR = ar
547548RM = rm -f
548549DIFF = diff
@@ -2128,7 +2129,7 @@ git.sp git.s git.o: EXTRA_CPPFLAGS = \
21282129 ' -DGIT_INFO_PATH="$(infodir_relative_SQ)"'
21292130
21302131git$X : git.o GIT-LDFLAGS $(BUILTIN_OBJS ) $(GITLIBS )
2131- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) \
2132+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) \
21322133 $(filter % .o,$^ ) $(LIBS )
21332134
21342135help.sp help.s help.o : command-list.h
@@ -2459,25 +2460,25 @@ compat/nedmalloc/nedmalloc.sp: SP_EXTRA_FLAGS += -Wno-non-pointer-null
24592460endif
24602461
24612462git-% $X : % .o GIT-LDFLAGS $(GITLIBS )
2462- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) $(LIBS )
2463+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) $(LIBS )
24632464
24642465git-bugreport$X : bugreport.o GIT-LDFLAGS $(GITLIBS )
2465- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2466+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
24662467 $(LIBS )
24672468
24682469git-imap-send$X : imap-send.o $(IMAP_SEND_BUILDDEPS ) GIT-LDFLAGS $(GITLIBS )
2469- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2470+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
24702471 $(IMAP_SEND_LDFLAGS ) $(LIBS )
24712472
24722473git-http-fetch$X : http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS )
2473- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2474+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
24742475 $(CURL_LIBCURL ) $(LIBS )
24752476git-http-push$X : http.o http-push.o GIT-LDFLAGS $(GITLIBS )
2476- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2477+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
24772478 $(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
24782479
24792480git-remote-testsvn$X : remote-testsvn.o GIT-LDFLAGS $(GITLIBS ) $(VCSSVN_LIB )
2480- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) $(LIBS ) \
2481+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) $(LIBS ) \
24812482 $(VCSSVN_LIB )
24822483
24832484$(REMOTE_CURL_ALIASES ) : $(REMOTE_CURL_PRIMARY )
@@ -2487,7 +2488,7 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
24872488 cp $< $@
24882489
24892490$(REMOTE_CURL_PRIMARY ) : remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS )
2490- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
2491+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) \
24912492 $(CURL_LIBCURL ) $(EXPAT_LIBEXPAT ) $(LIBS )
24922493
24932494$(LIB_FILE ) : $(LIB_OBJS )
@@ -2782,7 +2783,7 @@ t/helper/test-svn-fe$X: $(VCSSVN_LIB)
27822783t/helper/test-tool$X : $(patsubst % ,t/helper/% ,$(TEST_BUILTINS_OBJS ) )
27832784
27842785t/helper/test-% $X : t/helper/test-% .o GIT-LDFLAGS $(GITLIBS )
2785- $(QUIET_LINK )$(CC ) $( ALL_CFLAGS ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) $(filter % .a,$^ ) $(LIBS )
2786+ $(QUIET_LINK )$(LD ) -o $@ $(ALL_LDFLAGS ) $(filter % .o,$^ ) $(filter % .a,$^ ) $(LIBS )
27862787
27872788check-sha1 :: t/helper/test-tool$X
27882789 t/helper/test-sha1.sh
0 commit comments