|
Gérard Milmeister |
8d9a91 |
--- otp_src_R10B-3/lib/crypto/c_src/Makefile.in.rpath 2005-02-13 15:22:29.208560819 +0100
|
|
Gérard Milmeister |
8d9a91 |
+++ otp_src_R10B-3/lib/crypto/c_src/Makefile.in 2005-02-13 15:22:50.852106461 +0100
|
|
Gérard Milmeister |
8d9a91 |
@@ -79,7 +79,7 @@
|
|
Gérard Milmeister |
8d9a91 |
ifeq ($(HOST_OS),)
|
|
Gérard Milmeister |
8d9a91 |
HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
|
|
Gérard Milmeister |
8d9a91 |
endif
|
|
Gérard Milmeister |
8d9a91 |
-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
|
|
Gérard Milmeister |
8d9a91 |
+LD_R_FLAG=
|
|
Gérard Milmeister |
8d9a91 |
ifeq ($(findstring @,$(LD_R_FLAG)),@)
|
|
Gérard Milmeister |
8d9a91 |
# Old erts configure used which hasn't replaced
|
|
Gérard Milmeister |
8d9a91 |
# @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@; we try our best here instead...
|
|
Gérard Milmeister |
8d9a91 |
--- otp_src_R10B-3/lib/crypto/priv/Makefile.rpath 2005-02-13 14:46:15.043814168 +0100
|
|
Gérard Milmeister |
8d9a91 |
+++ otp_src_R10B-3/lib/crypto/priv/Makefile 2005-02-13 14:46:48.575467543 +0100
|
|
Gérard Milmeister |
8d9a91 |
@@ -60,7 +60,7 @@
|
|
Gérard Milmeister |
8d9a91 |
# ----------------------------------------------------
|
|
Gérard Milmeister |
8d9a91 |
|
|
Gérard Milmeister |
8d9a91 |
$(SO_DRIVER): $(OBJS)
|
|
Gérard Milmeister |
8d9a91 |
- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
|
|
Gérard Milmeister |
8d9a91 |
+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
|
|
Gérard Milmeister |
8d9a91 |
-o $@ $^ -lcrypto
|
|
Gérard Milmeister |
8d9a91 |
|
|
Gérard Milmeister |
8d9a91 |
$(DLL_DRIVER): $(OBJS)
|
|
Gérard Milmeister |
8d9a91 |
--- otp_src_R10B-3/lib/ssh/c_src/Makefile.in.rpath 2005-02-13 15:23:13.516486079 +0100
|
|
Gérard Milmeister |
8d9a91 |
+++ otp_src_R10B-3/lib/ssh/c_src/Makefile.in 2005-02-13 15:23:25.130630385 +0100
|
|
Gérard Milmeister |
8d9a91 |
@@ -75,7 +75,7 @@
|
|
Gérard Milmeister |
8d9a91 |
else
|
|
Gérard Milmeister |
8d9a91 |
DYN_DRIVER = $(LIBDIR)/ssh_crypto_drv.so
|
|
Gérard Milmeister |
8d9a91 |
endif
|
|
Gérard Milmeister |
8d9a91 |
-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
|
|
Gérard Milmeister |
8d9a91 |
+LD_R_FLAG=
|
|
Gérard Milmeister |
8d9a91 |
ifeq ($(findstring @,$(LD_R_FLAG)),@)
|
|
Gérard Milmeister |
8d9a91 |
# Old erts configure used which hasn't replaced
|
|
Gérard Milmeister |
8d9a91 |
# @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@; we try our best here instead...
|
|
Gérard Milmeister |
8d9a91 |
--- otp_src_R10B-3/erts/configure.rpath 2005-02-13 14:44:11.498507144 +0100
|
|
Gérard Milmeister |
8d9a91 |
+++ otp_src_R10B-3/erts/configure 2005-02-13 14:44:55.858437414 +0100
|
|
Gérard Milmeister |
8d9a91 |
@@ -1231,7 +1231,7 @@
|
|
Gérard Milmeister |
8d9a91 |
CFLAGS="$CFLAGS $extra_flags"
|
|
Gérard Milmeister |
8d9a91 |
DEBUG_CFLAGS="-g $extra_flags"
|
|
Gérard Milmeister |
8d9a91 |
|
|
Gérard Milmeister |
8d9a91 |
-CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-R"
|
|
Gérard Milmeister |
8d9a91 |
+CFLAG_RUNTIME_LIBRARY_PATH=""
|
|
Gérard Milmeister |
8d9a91 |
case $host_os in
|
|
Gérard Milmeister |
8d9a91 |
darwin*)
|
|
Gérard Milmeister |
8d9a91 |
CFLAG_RUNTIME_LIBRARY_PATH=
|