X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=77d67b4dca528908988c378bcc31ae5ce70744e8;hb=52d59bef96c881381bce1bcb84a8c08ce48c2544;hp=173bfec17dd19ed281cf7671072fca406efefd99;hpb=1aea71dbe35e5c5838ce1880d0f99d5eba1c26e2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index 173bfec..77d67b4 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -105,13 +105,13 @@ true)
 	case "$osname" in
 	linux)
 		rm -f preload
-		cat <<-'EOT' > preload
-		#! /bin/sh
-		lib=$1
-		shift
-		test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
-		exec "$@"
-		EOT
+		cat <<'EOT' > preload
+#! /bin/sh
+lib=$1
+shift
+test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
+exec "$@"
+EOT
 		chmod 755 preload
 		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
 		;;
@@ -546,6 +546,27 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
 	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
 !NO!SUBS!
 		;;
+	darwin*)
+		case "$osvers" in
+		[1-6].*) ;;
+		*) case "$ldflags" in
+		    *"-flat_namespace"*) ;;
+		    *) # to allow opmini.o to override stuff in libperl.dylib
+		$spitshell >>Makefile <<!NO!SUBS!
+NAMESPACEFLAGS = -force_flat_namespace
+!NO!SUBS!
+		       ;;
+		    esac
+		    ;;
+		esac
+		$spitshell >>Makefile <<'!NO!SUBS!'
+miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
+	-@rm -f miniperl.xok
+	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \
+	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
+	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+!NO!SUBS!
+		;;
 	*)
 		$spitshell >>Makefile <<'!NO!SUBS!'
 miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)