Makefile: reorder linker flags in the git executable rule
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>
David Michael committed
Oct 26, 2014 at 13:33 UTC
48a031af3cc555e0eb9d30b96f2e0943de7c44ae
1 file changed
+2
-2
Makefile
+2
-2
@@ -1735,8 +1735,8 @@ git.sp git.s git.o: EXTRA_CPPFLAGS = \
1735
'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
1736
1737
git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
1738
- $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
1739
- $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
1738
+ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) git.o \
1739
+ $(BUILTIN_OBJS) $(LIBS)
1740
1741
help.sp help.s help.o: common-cmds.h
1742