Integrate patch-ad and patch-ah into patch-ad.

Submitted by:	Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
This commit is contained in:
Jun Kuriyama 1998-10-10 13:08:16 +00:00
parent 4370c7a05e
commit fcc2dad64f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13852
2 changed files with 29 additions and 13 deletions

View File

@ -9,17 +9,6 @@
cf_email=''
cf_by=''
cf_time=''
@@ -818,7 +818,9 @@
i_whoami=''
: change the next line if compiling for Xenix/286 on Xenix/386
-xlibpth='/usr/lib/386 /lib/386'
+xlibpth="/usr/lib/386 /lib/386"
+: change the next line if compiling for FreeBSD 3.0
+xlibpth="/usr/lib/aout $xlibpath"
: Possible local library directories to search.
loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
@@ -862,7 +864,7 @@
: If anyone needs -lnet, put it in a hint file.
libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl'

View File

@ -1,5 +1,5 @@
--- hints/freebsd.sh.ORIG Fri Jul 24 06:00:19 1998
+++ hints/freebsd.sh Thu Jul 30 16:04:24 1998
--- hints/freebsd.sh.orig Fri Jul 24 13:00:19 1998
+++ hints/freebsd.sh Sat Oct 10 20:39:02 1998
@@ -68,6 +68,7 @@
d_setreuid='define'
d_setegid='undef'
@ -27,3 +27,30 @@
;;
esac
@@ -95,12 +102,20 @@
case "$osvers" in
0.*|1.0*) ;;
-3.0*) if [ -e /usr/lib/aout ]; then
- libpth="/usr/lib/aout /usr/local/lib /usr/lib"
- glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
- fi
- cccdlflags='-DPIC -fpic'
- lddlflags='-Bshareable'
+3.0*) objformat=`objformat`
+ if [ x$objformat = xelf ]; then
+ libpth="/usr/lib /usr/local/lib"
+ glibpth="/usr/lib /usr/local/lib"
+ ldflags="-Wl,-E "
+ lddlflags="-shared "
+ else
+ if [ -e /usr/lib/aout ]; then
+ libpth="/usr/lib/aout /usr/local/lib /usr/lib"
+ glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
+ fi
+ lddlflags='-Bshareable'
+ fi
+ cccdlflags='-DPIC -fpic'
;;
*) cccdlflags='-DPIC -fpic'