summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2000-10-16 21:23:36 +0000
committerBrad Smith <brad@cvs.openbsd.org>2000-10-16 21:23:36 +0000
commit0aba62f73cc7d3eda21de912a084a235451988f1 (patch)
tree89fd6b633a4e81125968383504aaee5a687d863c
parentf5db96b00d0b104c137519086b513039beb31f5c (diff)
use "cc -shared" to link the modules on 2.8 and up.
Ok'd by beck@, espie@ and deraadt@
-rw-r--r--usr.sbin/httpd/src/Configure13
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.sbin/httpd/src/Configure b/usr.sbin/httpd/src/Configure
index 73896039b12..a86015392f1 100644
--- a/usr.sbin/httpd/src/Configure
+++ b/usr.sbin/httpd/src/Configure
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: Configure,v 1.11 2000/03/19 11:16:52 beck Exp $
+# $OpenBSD: Configure,v 1.12 2000/10/16 21:23:35 brad Exp $
## ====================================================================
## Copyright (c) 1995-1999 The Apache Group. All rights reserved.
##
@@ -1060,8 +1060,17 @@ if [ "x$using_shlib" = "x1" ] ; then
fi
;;
*-openbsd*)
+ PLATOSVERS=`echo $PLAT | sed 's/^.*openbsd//'`
CFLAGS_SHLIB="-fPIC"
- LDFLAGS_SHLIB="-Bforcearchive -Bshareable"
+ case "$PLATOSVERS" in
+ 2.[01234567])
+ LDFLAGS_SHLIB="-Bshareable -Bforcearchive"
+ ;;
+ *)
+ LD_SHLIB="gcc"
+ LDFLAGS_SHLIB="-shared ${CFLAGS_SHLIB}"
+ ;;
+ esac
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=""
SHLIB_SUFFIX_DEPTH=2