More on the macro debugging and expansion.

[p5sagit/p5-mst-13.2.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index 173bfec..77d67b4 100644 (file)
--- 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)