summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-29 10:08:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-29 10:08:07 -0700
commitce71c1f3398a956b0152f8ebf11b7a9d50a3095e (patch)
tree67e956e549c2f7726b75b15ba96e9fe47a1bb633 /Makefile
parentMerge branch 'oc/mergetools-beyondcompare' (diff)
parentcompat/bswap.h: detect endianness from XL C compiler macros (diff)
downloadtgif-ce71c1f3398a956b0152f8ebf11b7a9d50a3095e.tar.xz
Merge branch 'dm/port2zos'
z/OS port * dm/port2zos: compat/bswap.h: detect endianness from XL C compiler macros Makefile: reorder linker flags in the git executable rule git-compat-util.h: support variadic macros with the XL C compiler
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fcd51ac463..827006ba61 100644
--- a/Makefile
+++ b/Makefile
@@ -1610,8 +1610,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