diff options
| author | lukem <lukem@NetBSD.org> | 2001-12-28 01:32:37 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2001-12-28 01:32:37 +0000 |
| commit | efcc9a4c9dba0a5fac3f68d5306510cd786dc48d (patch) | |
| tree | 920de391cc2cdf45d0bfd24086e0df48f852a3e1 /gnu/lib/libstdc++ | |
| parent | f690fc084569159e99c1819692831592aac8411d (diff) | |
* Add user-controlled mk.conf variables
- SHLIBDIR Location to install shared libraries if ${USE_SHLIBDIR}
is "yes". Defaults to "/usr/lib".
- USE_SHLIBDIR If "yes", install shared libraries in ${SHLIBDIR}
instead of ${LIBDIR}. Defaults to "no".
Sets ${_LIBSODIR} to the appropriate value.
This may be set by individual Makefiles as well.
- SHLINKDIR Location of shared linker. Defaults to "/usr/libexec".
If != "/usr/libexec", change the dynamic-linker
encoded in shared programs
* Set USE_SHLIBDIR for libraries used by /bin and /sbin:
libc libcrypt libcrypto libedit libipsec libkvm libm libmi387
libtermcap libutil libz
* If ${_LIBSODIR} != ${LIBDIR}, add symlinks from ${LIBDIR}/${LIB}.so*
to ${_LIBSODIR}/${LIB}.so* for compatibility.
* Always install /sbin/init statically (for now)
The net effect of these changes depends on how the variables are set:
1.) If nothing is set or changed, there is no change from the
current behaviour:
- Static /bin, /sbin, and bits of /usr/*
- Dynamic rest
- Shared linker is /usr/libexec/ld*so
2.) If the following make variables are set:
LDSTATIC=
SHLINKDIR=/lib
SHLIBDIR=/lib
Then the behaviour becomes:
- Dynamic tools
- .so libraries used by /bin and /sbin are installed to /lib,
with symlinks from /usr/lib/lib*so to -> /lib/lib*so
where appropriate
- Shared linker is /lib/ld*so
3.) As per 2.), but add the following variable:
USE_SHLIBDIR=yes
This forces all .so's to be instaleld in /lib (with compat
symlinks), not just those tagged by their Makefiles to be.
Again, compat symlinks are installed
Diffstat (limited to 'gnu/lib/libstdc++')
| -rw-r--r-- | gnu/lib/libstdc++/config/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/lib/libstdc++/config/Makefile b/gnu/lib/libstdc++/config/Makefile index 9ec2cc4dda7..579ae4b4e92 100644 --- a/gnu/lib/libstdc++/config/Makefile +++ b/gnu/lib/libstdc++/config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/11/26 00:02:40 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2001/12/28 01:32:37 lukem Exp $ # Makefile for _G_config.h, a machine-dependent automatically generated # configuration file. @@ -20,8 +20,8 @@ CLEANFILES= dummy.c dummy.h dummy.C _G_config.h DIST= ${.CURDIR}/../../../dist .ifdef DESTDIR -LDPRE= -nostdlib -L${DESTDIR}/usr/lib -R${DESTDIR}/usr/lib ${LIBCRT0} \ - ${LIBCRTBEGIN} +LDPRE= -nostdlib -L${DESTDIR}${SHLIBDIR} -L${DESTDIR}/usr/lib \ + -R${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} LDSUF= -lgcc -lc -lgcc ${LIBCRTEND} .endif |
