diff options
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | sapi/cgi/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/cli/config.m4 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ce15247f1e..5cd89337a0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -875,7 +875,7 @@ AC_DEFUN(PHP_ADD_LIBPATH,[ PHP_ADD_LIBPATH_GLOBAL([$ai_p]) ],[ if test "$ext_shared" = "yes"; then - $2="-R$ai_p -L$ai_p [$]$2" + $2="$ld_runpath_switch$ai_p -L$ai_p [$]$2" else PHP_ADD_LIBPATH_GLOBAL([$ai_p]) fi diff --git a/sapi/cgi/config.m4 b/sapi/cgi/config.m4 index 2613195ab9..0cd2d3d9a4 100644 --- a/sapi/cgi/config.m4 +++ b/sapi/cgi/config.m4 @@ -100,7 +100,7 @@ PHP_SUBST(FHTTPD_TARGET) case $host_alias in *darwin*) - BUILD_CGI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php" + BUILD_CGI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php" ;; *) BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php" diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index a7dc32264f..010ce775c7 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -16,7 +16,7 @@ AC_ARG_ENABLE(cli, if test "$PHP_SAPI_CLI" != "no"; then case $host_alias in *darwin*) - BUILD_CLI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php" + BUILD_CLI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php" ;; *) BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php" |