diff options
| author | Sverker Eriksson <[email protected]> | 2014-02-19 16:50:00 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-02-19 16:50:00 +0100 |
| commit | 5cdba8e38d1e2043959a20739e435cc56453240b (patch) | |
| tree | aeceb4ad5138729903f1f70f47e19df57aaf1233 /lib | |
| parent | a40cc981b6b13d9a6514d2c326eb5f4904f80983 (diff) | |
| parent | c3fb1d51b73867a9045171e812cc0acb82126edd (diff) | |
| download | otp-5cdba8e38d1e2043959a20739e435cc56453240b.tar.gz otp-5cdba8e38d1e2043959a20739e435cc56453240b.tar.bz2 otp-5cdba8e38d1e2043959a20739e435cc56453240b.zip | |
Merge branch 'sverk/test_server/openbsd-dynlink'
* sverk/test_server/openbsd-dynlink:
erts: Skip driver_SUITE:thr_free_drv for VM without threads
erts: Fix driver_SUITE:otp_9302 for VM without threads
test_server: Fix dynlib link command for openbsd
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_server/src/configure.in | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/lib/test_server/src/configure.in b/lib/test_server/src/configure.in index 067663feb4..cd723bcd4d 100644 --- a/lib/test_server/src/configure.in +++ b/lib/test_server/src/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script for Erlang. dnl dnl %CopyrightBegin% dnl -dnl Copyright Ericsson AB 1997-2013. All Rights Reserved. +dnl Copyright Ericsson AB 1997-2014. All Rights Reserved. dnl dnl The contents of this file are subject to the Erlang Public License, dnl Version 1.1, (the "License"); you may not use this file except in @@ -170,7 +170,30 @@ case $system in fi SHLIB_EXTRACT_ALL="" ;; - *-netbsd*|*-freebsd*|*-openbsd*|*-dragonfly*) + *-openbsd*) + # Not available on all versions: check for include file. + AC_CHECK_HEADER(dlfcn.h, [ + SHLIB_CFLAGS="-fpic" + SHLIB_LD="${CC}" + SHLIB_LDFLAGS="$LDFLAGS -shared" + SHLIB_SUFFIX=".so" + if test X${enable_m64_build} = Xyes; then + AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers) + fi + if test X${enable_m32_build} = Xyes; then + AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers) + fi + ], [ + # No dynamic loading. + SHLIB_CFLAGS="" + SHLIB_LD="ld" + SHLIB_LDFLAGS="" + SHLIB_SUFFIX="" + AC_MSG_ERROR(don't know how to compile and link dynamic drivers) + ]) + SHLIB_EXTRACT_ALL="" + ;; + *-netbsd*|*-freebsd*|*-dragonfly*) # Not available on all versions: check for include file. AC_CHECK_HEADER(dlfcn.h, [ SHLIB_CFLAGS="-fpic" |