From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 11 Dec 2001 00:59:31 +0000 (+0000)
Subject: The BeOS linker seems to link the last seen symbol,
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8fdf96e193e9dbf77ecf07946351093649d1650f;p=p5sagit%2Fp5-mst-13.2.git

The BeOS linker seems to link the last seen symbol,
not the first (so the symbols of op.o from libperl.so
would get linked to miniperl instead of the symbols of
opmini.o)-- use the same trick as for NeXT4 for linking
miniperl.

p4raw-id: //depot/perl@13609
---

diff --git a/Makefile.SH b/Makefile.SH
index 8092bf5..7ff5079 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -494,19 +494,19 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
 !NO!SUBS!
 
 	case "${osname}${osvers}" in
-	next4*)
+	aix*)
 		$spitshell >>Makefile <<'!NO!SUBS!'
 miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
-	$(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
+	$(CC) -o miniperl $(CLDFLAGS) \
+	    `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
 	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
 !NO!SUBS!
 		;;
-	aix*)
+	beos*|next4*)
 		$spitshell >>Makefile <<'!NO!SUBS!'
 miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
-	$(CC) -o miniperl $(CLDFLAGS) \
-	    `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
+	$(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
 	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
 !NO!SUBS!