In perl.git, the branch smoke-me/Makefile-miniperl-unification has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/76279d75a2ebff9cf8574c66a594523a4e89637f?hp=beccd652461b282e761982c74609fb71d8feb08c> - Log ----------------------------------------------------------------- commit 76279d75a2ebff9cf8574c66a594523a4e89637f Author: Nicholas Clark <[email protected]> Date: Mon Apr 30 10:49:21 2012 +0200 Eliminate the special case linking of miniperl on darwin, which is redundant. Commit cb3fc4263509f28c (May 2003) removed the use of -flat_namespace from the link flags, but added it specially in Makefile.SH for miniperl, so that symbols from opmini.o overrode those in libperl.dylib. However, a side effect of commit 908fcb8bef8cbab8 (Dec 2006) was to change the linker line to use explicit object files, meaning that op.o was no longer part of linking, meaning that the override is no longer needed. Hence darwin's link does not need special-casing. ----------------------------------------------------------------------- Summary of changes: Makefile.SH | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/Makefile.SH b/Makefile.SH index 713f5c2..0caaa30 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -813,27 +813,6 @@ $(MINIPERL_EXE): $& $(mini_obj) $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -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): $& $(mini_obj) - -@rm -f miniperl.xok - $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ - $(mini_obj) $(libs) - $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest -!NO!SUBS! - ;; *) $spitshell >>$Makefile <<'!NO!SUBS!' $(MINIPERL_EXE): $& $(mini_obj) -- Perl5 Master Repository
