X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdarwin.sh;h=33d594ca2ad70ee24d1f45f0e200d0fb55797ea5;hb=8e4985cd06cac8609b7c84aab08fe2d8d20f9526;hp=cdb61b05f09f8546084b70f9d83ca861780e2ea1;hpb=835bc3f3709faed7fcdc19f9e1d8703aa21e0355;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/darwin.sh b/hints/darwin.sh
index cdb61b0..33d594c 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -35,6 +35,18 @@ case "$prefix" in
     sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also
     vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
     ;;
+
+  *)
+    # Anything else; use non-system directories
+    # prefix=$prefix; # Built-in perl uses /usr
+    siteprefix=$prefix;
+    vendorprefix='/usr'; usevendorprefix='define';
+
+    # Where to put modules.
+    sitelib=$prefix/lib/perl5/site_perl/${version}
+    vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
+    ;;
+
 esac
 
 # 4BSD uses ${prefix}/share/man, not ${prefix}/man.
@@ -51,6 +63,8 @@ archname='darwin';
 # nm works.
 usenm='true';
 
+case "$optimize" in
+'')
 #    Optimizing for size also mean less resident memory usage on the part
 # of Perl.  Apple asserts that this is a more important optimization than
 # saving on CPU cycles.  Given that memory speed has not increased at
@@ -64,10 +78,15 @@ if [ -z "${optimize}" ]; then
 else
   optimize='-O3'
 fi
+;;
+esac
 
 # -pipe: makes compilation go faster.
 # -fno-common because common symbols are not allowed in MH_DYLIB
-ccflags="${ccflags} -pipe -fno-common"
+# -DDARWIN: apparently the __APPLE__ is not sanctioned by Apple
+# as the way to differentiate Mac OS X.  (The official line is that
+# *no* cpp symbol does differentiate Mac OS X.)
+ccflags="${ccflags} -pipe -fno-common -DDARWIN"
 
 # At least on Darwin 1.3.x:
 #
@@ -114,13 +133,40 @@ dlext='bundle';
 dlsrc='dl_dyld.xs'; usedl='define';
 cccdlflags=' '; # space, not empty, because otherwise we get -fpic
 # Perl bundles do not expect two-level namespace, added in Darwin 1.4.
+# But starting from perl 5.8.1/Darwin 7 the default is the two-level.
 case "$osvers" in
-  1.[0-3].*) ;;
-  *) ldflags="${ldflags} -flat_namespace" ;;
+1.[0-3].*)
+   lddlflags="${ldflags} -bundle -undefined suppress"
+   ;;
+1.*)
+   ldflags="${ldflags} -flat_namespace"
+   lddlflags="${ldflags} -bundle -undefined suppress"
+   ;;
+[2-6].*)
+   ldflags="${ldflags} -flat_namespace"
+   lddlflags="${ldflags} -bundle -undefined suppress"
+   ;;
+*) lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
+   case "$ld" in
+   *MACOSX_DEVELOPMENT_TARGET*) ;;
+   *) ld="MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
+   esac
+   ;;
 esac
-lddlflags="${ldflags} -bundle -undefined suppress";
 ldlibpthname='DYLD_LIBRARY_PATH';
-useshrplib='true';
+
+# useshrplib=true results in much slower startup times.
+# 'false' is the default value.  Use Configure -Duseshrplib to override.
+
+cat > UU/archname.cbu <<'EOCBU'
+# This script UU/archname.cbu will get 'called-back' by Configure 
+# after it has otherwise determined the architecture name.
+case "$ldflags" in
+*"-flat_namespace"*) ;; # Backward compat, be flat.
+# If we are using two-level namespace, we will munge the archname to show it.
+*) archname="${archname}-2level" ;;
+esac
+EOCBU
 
 ##
 # System libraries