From be1a8292467bed58a74b8585fa1f3ca9cf0cdcdc Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Thu, 30 Sep 2021 05:59:18 +0000 Subject: [PATCH] Remove vestigial next4*) sections from Makefile.SH NeXT support was removed in June 2014 by commit f05550c064c27360: Removed NeXT support but that commit missed these hunks. The crazy whitespace errors in the next4*) section were added by mistake by me in June 2013 by commit b78ac7159b42a0e0: write_buildcustomize.pl no longer writes to STDOUT I'm not sure how I goofed that, but it had the side effect of breaking NeXT builds, and no-one noticed. --- Cross/Makefile-cross-SH | 6 ------ Makefile.SH | 14 -------------- 2 files changed, 20 deletions(-) diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index 032fcd2817..a774f4a260 100644 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -47,12 +47,6 @@ true) pldlflags="$cccdlflags" static_ldflags='' case "${osname}${osvers}" in - next4*) - ld=libtool - lddlflags="-dynamic -undefined warning -framework System \ - -compatibility_version 1 -current_version $patchlevel \ - -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" - ;; darwin*) shrpldflags="${ldflags} -dynamiclib \ -compatibility_version \ diff --git a/Makefile.SH b/Makefile.SH index ed6ad84395..55bd80093f 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -56,12 +56,6 @@ true) pldlflags="$cccdlflags" static_ldflags='' case "${osname}${osvers}" in - next4*) - ld=libtool - lddlflags="-dynamic -undefined warning -framework System \ - -compatibility_version 1 -current_version $patchlevel \ - -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" - ;; darwin*) shrpldflags="${ldflags} -dynamiclib \ -compatibility_version \ @@ -1008,14 +1002,6 @@ lib/buildcustomize.pl: $& $(miniperl_objs) $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs) $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' $(MINIPERL) -f write_buildcustomize.pl -!NO!SUBS! - ;; - next4*) - $spitshell >>$Makefile <<'!NO!SUBS!' -lib/buildcustomize.pl: $& $(miniperl_objs) write ldcustomize.pl - $(CC) -o $(MINIPERL_EXE) $(miniperl_objs libs) - $(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' - $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! ;; darwin*)