49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in
|
|
--- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530
|
|
+++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530
|
|
@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),)
|
|
HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
|
|
endif
|
|
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
|
|
-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
|
|
+LD_R_FLAG=
|
|
ifeq ($(strip $(LD_R_FLAG)),)
|
|
LD_R_OPT =
|
|
else
|
|
diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile
|
|
--- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530
|
|
+++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530
|
|
@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
|
|
# ----------------------------------------------------
|
|
|
|
$(SO_DRIVER): $(OBJS)
|
|
- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
|
|
+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
|
|
-o $@ $^ -lcrypto
|
|
|
|
$(DLL_DRIVER): $(OBJS)
|
|
diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in
|
|
--- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530
|
|
+++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530
|
|
@@ -104,7 +104,7 @@ else
|
|
SSL_MAKEFILE =
|
|
endif
|
|
|
|
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
|
|
+CC_R_FLAG=
|
|
ifeq ($(findstring @,$(CC_R_FLAG)),@)
|
|
# Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
|
|
# we try our best here instead...
|
|
@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
|
|
CC_R_FLAG =
|
|
else
|
|
ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath,
|
|
-CC_R_FLAG = -Wl,-rpath,
|
|
+CC_R_FLAG =
|
|
else # Default: -Wl,-R
|
|
-CC_R_FLAG = -Wl,-R
|
|
+CC_R_FLAG =
|
|
endif
|
|
endif
|
|
endif
|