|
 |
e1055a8 |
diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in
|
|
|
e1055a8 |
--- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200
|
|
|
e1055a8 |
+++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200
|
|
|
e1055a8 |
@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),)
|
|
|
8d9a918 |
HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
|
|
|
8d9a918 |
endif
|
|
|
e1055a8 |
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
|
|
|
8d9a918 |
-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
|
|
|
8d9a918 |
+LD_R_FLAG=
|
|
|
da518fa |
ifeq ($(strip $(LD_R_FLAG)),)
|
|
|
da518fa |
LD_R_OPT =
|
|
|
da518fa |
else
|
|
|
e1055a8 |
diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile
|
|
|
e1055a8 |
--- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200
|
|
|
e1055a8 |
+++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200
|
|
|
e1055a8 |
@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
|
|
|
8d9a918 |
# ----------------------------------------------------
|
|
|
8d9a918 |
|
|
|
8d9a918 |
$(SO_DRIVER): $(OBJS)
|
|
|
8d9a918 |
- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
|
|
|
8d9a918 |
+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
|
|
|
8d9a918 |
-o $@ $^ -lcrypto
|
|
|
8d9a918 |
|
|
|
8d9a918 |
$(DLL_DRIVER): $(OBJS)
|
|
|
e1055a8 |
diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
|
|
|
e1055a8 |
--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200
|
|
|
e1055a8 |
+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200
|
|
|
e1055a8 |
@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
|
|
|
da518fa |
CC_R_FLAG =
|
|
|
8d9a918 |
else
|
|
|
da518fa |
ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath,
|
|
|
da518fa |
-CC_R_FLAG = -Wl,-rpath,
|
|
|
da518fa |
+CC_R_FLAG =
|
|
|
da518fa |
else # Default: -Wl,-R
|
|
|
da518fa |
-CC_R_FLAG = -Wl,-R
|
|
|
da518fa |
+CC_R_FLAG =
|
|
|
da518fa |
endif
|
|
|
8d9a918 |
endif
|
|
|
e1055a8 |
endif
|