]> granicus.if.org Git - git/commitdiff
Makefile: reorder linker flags in the git executable rule
authorDavid Michael <fedora.dm0@gmail.com>
Sun, 26 Oct 2014 17:33:53 +0000 (13:33 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Oct 2014 18:49:18 +0000 (11:49 -0700)
The XL C compiler can fail due to mixing library path and object
file arguments, for example when linking git while building with
"gmake LDFLAGS=-L$prefix/lib".

Move the ALL_LDFLAGS variable expansion in the git executable rule
to be consistent with all the other linking rules, namely to have
LDFLAGS such as -L$where before the object files *.o being linked
together.

Signed-off-by: David Michael <fedora.dm0@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile

index 9f984a9e5561d6b67b453124a311963ae8845f6d..4c6847a0bed128e4bf81b1c0f4b6d9eea1cad67c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1735,8 +1735,8 @@ git.sp git.s git.o: EXTRA_CPPFLAGS = \
        '-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
 
 git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
-       $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
-               $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
+       $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) git.o \
+               $(BUILTIN_OBJS) $(LIBS)
 
 help.sp help.s help.o: common-cmds.h