X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fnext_4.sh;h=d1d0398dd9ae5bcc68c2d6e4ea1d1c36ea9e62d2;hb=73d40b3e8e2639688f6a52079a430333769fcb55;hp=b3887e612b0fc88718f4595dd7ecd76789b0a8a2;hpb=dfe9444ca7881e716e9e8feaf20b55da491363ca;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/next_4.sh b/hints/next_4.sh
index b3887e6..d1d0398 100644
--- a/hints/next_4.sh
+++ b/hints/next_4.sh
@@ -12,7 +12,7 @@
 #
 useposix='undef'
 
-libpth='/lib /usr/lib'
+libpth='/lib /usr/lib /usr/local/lib'
 libswanted=' '
 libc='/NextLibrary/Frameworks/System.framework/System'
 
@@ -35,7 +35,20 @@ ld='cc'
 #
 #	archs='m68k i386'
 #
-archs=`/bin/lipo -info /usr/lib/libm.a | sed -n 's/^[^:]*:[^:]*: //p'`
+
+# On m68k machines, toke.c cannot be compiled at all for i386 and it can
+# only be compiled for m68k itself without optimization (this is under
+# OPENSTEP 4.2).
+#
+if [ `hostinfo | grep 'NeXT Mach.*:'  | sed 's/.*RELEASE_//'` = M68K ]
+then
+	echo "Cross compilation is impossible on m68k hardware under OS 4"
+	echo "Forcing architecture to m68k only"
+	toke_cflags='optimize=""'
+	archs='m68k'
+else
+	archs=`/bin/lipo -info /usr/lib/libm.a | sed -n 's/^[^:]*:[^:]*: //p'`
+fi
 
 #
 # leave the following part alone