summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar David Michael <fedora.dm0@gmail.com>2014-10-26 13:33:53 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-27 11:49:18 -0700
commit48a031af3cc555e0eb9d30b96f2e0943de7c44ae (patch)
tree31149808f52a5aed0c8863a3b4e5311784a26883 /Makefile
parentgit-compat-util.h: support variadic macros with the XL C compiler (diff)
downloadtgif-48a031af3cc555e0eb9d30b96f2e0943de7c44ae.tar.xz
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9f984a9e55..4c6847a0be 100644
--- 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