提交 f5b904db 编写于 作者: J Junio C Hamano

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: NJunio C Hamano <gitster@pobox.com>
上级 2ebc02d3
...@@ -688,8 +688,7 @@ ifeq ($(uname_S),NetBSD) ...@@ -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) ...@@ -781,12 +780,14 @@ ifeq ($(uname_S),Darwin)
endif endif
endif endif
ifdef NO_R_TO_GCC_LINKER ifndef CC_LD_DYNPATH
# Some gcc does not accept and pass -R to the linker to specify ifdef NO_R_TO_GCC_LINKER
# the runtime dynamic library path. # Some gcc does not accept and pass -R to the linker to specify
CC_LD_DYNPATH = -Wl,-rpath= # the runtime dynamic library path.
else CC_LD_DYNPATH = -Wl,-rpath,
CC_LD_DYNPATH = -R else
CC_LD_DYNPATH = -R
endif
endif endif
ifdef NO_CURL ifdef NO_CURL
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册