Link DSOs with 'cc -shared' instead of 'ld -shared' so that

__guard_local is defined appropriately.

ok nigel
This commit is contained in:
matthew 2012-09-06 00:57:54 +00:00
parent 651353dd61
commit 3da8280559
2 changed files with 18 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.51 2012/08/30 20:54:59 pascal Exp $
# $OpenBSD: Makefile,v 1.52 2012/09/06 00:57:54 matthew Exp $
COMMENT= real-time, concurrent and distributed functional language
BROKEN-sparc= Requires v9|v9a|v9b; requested architecture is sparclite.
@ -7,7 +7,7 @@ V= R15B01
DISTNAME= otp_src_${V}
PKGNAME= erlang-15b.01
EPOCH= 0
REVISION= 0
REVISION= 1
CATEGORIES= lang
# Erlang Public License
@ -41,6 +41,7 @@ USE_GROFF = Yes
CONFIGURE_STYLE=autoconf no-autoheader
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -pthread"
AUTOCONF_VERSION=2.59
AUTOCONF_DIR= ${WRKSRC} ${WRKSRC}/erts
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/erts/autoconf \
${WRKSRC}/lib/erl_interface/src/auxdir

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-erts_configure_in,v 1.6 2012/09/06 00:57:54 matthew Exp $
--- erts/configure.in.orig Sun Apr 1 11:15:00 2012
+++ erts/configure.in Wed Sep 5 14:52:08 2012
@@ -3548,6 +3548,11 @@ case $host_os in
DED_LDFLAGS="-m32 $DED_LDFLAGS"
fi
;;
+ openbsd*)
+ DED_LD="$CC"
+ DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
+ DED_LDFLAGS="-shared"
+ ;;
osf*)
# NOTE! Whitespace after -rpath is important.
DED_LD_FLAG_RUNTIME_LIBRARY_PATH="-rpath "