summaryrefslogtreecommitdiff
path: root/gnu/lib
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-02-09 02:29:27 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-02-09 02:29:27 +0000
commit833f9ce99a819bb95f92e02e9058fc216eedf665 (patch)
tree57dc33efb7bb6aff4d426921caeb2502baba5b4b /gnu/lib
parent7ca28209ba7490efd10a75ae47d8fa64658d31e2 (diff)
Do not compile libstdc++ with --enable-shared on NOPIC archs. ok espie@
Diffstat (limited to 'gnu/lib')
-rw-r--r--gnu/lib/libstdc++/Makefile.bsd-wrapper9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/lib/libstdc++/Makefile.bsd-wrapper b/gnu/lib/libstdc++/Makefile.bsd-wrapper
index 4e08e5585e9..00bcb430f2b 100644
--- a/gnu/lib/libstdc++/Makefile.bsd-wrapper
+++ b/gnu/lib/libstdc++/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2004/01/13 10:57:35 espie Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2004/02/09 02:29:26 drahn Exp $
LIBIBERTY_INCLUDES=${.CURDIR}/../libiberty/include
LIBIBERTY_SRCDIR=${.CURDIR}/../libiberty/src
@@ -31,6 +31,11 @@ CF= --cache-file=${GLOBAL_AUTOCONF_CACHE}
.else
CF=
.endif
+.ifdef NOPIC
+CF_SHARED= --disable-shared
+.else
+CF_SHARED= --enable-shared
+.endif
config.status:
PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
@@ -39,7 +44,7 @@ config.status:
/bin/sh ${.CURDIR}/libstdc++/configure \
--prefix=/usr \
--disable-nls \
- --enable-shared \
+ ${CF_SHARED} \
--disable-multilib \
--with-gnu-ld \
--with-gxx-include-dir=${GXX_INCDIR} \