kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Makefile: Allow CC_LD_DYNPATH to be overriden 

Current Makefile does not allow config.mak to override CC_LD_DYNPATH; it
only lets it affect indirectly via NO_R_TO_GCC_LINKER.

If the command line, config.mak or config.mak.autogen wants to set
CC_LD_DYNPATH differently, we should just allow it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2008-08-16 21:56:24 -07:00
parent 2ebc02d32a
commit f5b904db6b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -688,8 +688,7 @@ ifeq ($(uname_S),NetBSD)
NEEDS_LIBICONV = YesPlease NEEDS_LIBICONV = YesPlease
endif endif
BASIC_CFLAGS += -I/usr/pkg/include BASIC_CFLAGS += -I/usr/pkg/include
BASIC_LDFLAGS += -L/usr/pkg/lib BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
endif endif
ifeq ($(uname_S),AIX) ifeq ($(uname_S),AIX)
NO_STRCASESTR=YesPlease NO_STRCASESTR=YesPlease
@ -781,12 +780,14 @@ ifeq ($(uname_S),Darwin)
endif endif
endif endif


ifdef NO_R_TO_GCC_LINKER ifndef CC_LD_DYNPATH
ifdef NO_R_TO_GCC_LINKER
# Some gcc does not accept and pass -R to the linker to specify # Some gcc does not accept and pass -R to the linker to specify
# the runtime dynamic library path. # the runtime dynamic library path.
CC_LD_DYNPATH = -Wl,-rpath= CC_LD_DYNPATH = -Wl,-rpath,
else else
CC_LD_DYNPATH = -R CC_LD_DYNPATH = -R
endif
endif endif


ifdef NO_CURL ifdef NO_CURL