From b2b69a966b47abd2cb4c320da60619b27c6c8abf Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Sun, 7 Jul 2013 13:55:29 +0100 Subject: Fix MidnightBSD hints file for 0.4-RELEASE 0.4 has no /usr/bin/objformat, so the hints file was falling through to configure for aout with fatal consequences. Confirmed that the objformat in 0.3 warns that it is deprecated. Have switched around the logic of the checks so that it will always configure for elf, using aout is explicitly detected. --- hints/midnightbsd.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'hints/midnightbsd.sh') diff --git a/hints/midnightbsd.sh b/hints/midnightbsd.sh index 13a5335468..1c0ea2f407 100644 --- a/hints/midnightbsd.sh +++ b/hints/midnightbsd.sh @@ -6,17 +6,17 @@ esac libswanted=`echo $libswanted | sed 's/ malloc / /'` objformat=`/usr/bin/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 [ x$objformat = xaout ]; then 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' +else + libpth="/usr/lib /usr/local/lib" + glibpth="/usr/lib /usr/local/lib" + ldflags="-Wl,-E " + lddlflags="-shared " fi cccdlflags='-DPIC -fPIC' -- cgit v1.2.1