diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:08:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:08:07 (GMT) |
| commit | ce71c1f3398a956b0152f8ebf11b7a9d50a3095e (patch) | |
| tree | 67e956e549c2f7726b75b15ba96e9fe47a1bb633 /Makefile | |
| parent | c1777a297043a06d6c18d383d17447f5eefcdcbe (diff) | |
| parent | bfb0e6fcd2826a869383b766712131a07a8059b0 (diff) | |
| download | git-ce71c1f3398a956b0152f8ebf11b7a9d50a3095e.zip git-ce71c1f3398a956b0152f8ebf11b7a9d50a3095e.tar.gz git-ce71c1f3398a956b0152f8ebf11b7a9d50a3095e.tar.bz2 | |
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-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |