diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-08 06:45:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-08 06:45:56 (GMT) |
| commit | cd50988ae03e086ca1a8f18584153d359699ea25 (patch) | |
| tree | adf7e5f2721d768e5a39146e1d8f6dae0f3dde91 /Makefile | |
| parent | fdfb4cfadcfdfe4ebafd0545b5ebb661433ea66c (diff) | |
| parent | 798a94500230e4d2a1a18f005fe9592454fe451b (diff) | |
| download | git-cd50988ae03e086ca1a8f18584153d359699ea25.zip git-cd50988ae03e086ca1a8f18584153d359699ea25.tar.gz git-cd50988ae03e086ca1a8f18584153d359699ea25.tar.bz2 | |
Merge branch 'jc/cc-ld-dynpath'
* jc/cc-ld-dynpath:
configure: auto detect dynamic library path switches
Makefile: Allow CC_LD_DYNPATH to be overriden
Conflicts:
Makefile
config.mak.in
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -697,8 +697,7 @@ ifeq ($(uname_S),NetBSD) NEEDS_LIBICONV = YesPlease endif BASIC_CFLAGS += -I/usr/pkg/include - BASIC_LDFLAGS += -L/usr/pkg/lib - ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib + BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib THREADED_DELTA_SEARCH = YesPlease endif ifeq ($(uname_S),AIX) @@ -793,12 +792,14 @@ ifeq ($(uname_S),Darwin) endif endif -ifdef NO_R_TO_GCC_LINKER - # Some gcc does not accept and pass -R to the linker to specify - # the runtime dynamic library path. - CC_LD_DYNPATH = -Wl,-rpath= -else - CC_LD_DYNPATH = -R +ifndef CC_LD_DYNPATH + ifdef NO_R_TO_GCC_LINKER + # Some gcc does not accept and pass -R to the linker to specify + # the runtime dynamic library path. + CC_LD_DYNPATH = -Wl,-rpath, + else + CC_LD_DYNPATH = -R + endif endif ifdef NO_CURL |