зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
f51140c247
Коммит
48a031af3c
4
Makefile
4
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
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче