diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2003-05-13 04:46:18 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-05-13 04:46:18 +0000 |
| commit | 69625aa92a91bf4ca9e0af8d5dd7d748e3cdd293 (patch) | |
| tree | f20f7cf30ed9def40f616edb34f2dff9774b29a5 | |
| parent | e27ad1f20b87bf08f3461d0be498f8d4da22a576 (diff) | |
| download | perl-69625aa92a91bf4ca9e0af8d5dd7d748e3cdd293.tar.gz | |
Detypo Pantherisms.
p4raw-id: //depot/perl@19506
| -rw-r--r-- | Makefile.SH | 17 | ||||
| -rw-r--r-- | hints/darwin.sh | 3 |
2 files changed, 9 insertions, 11 deletions
diff --git a/Makefile.SH b/Makefile.SH index 3d60f1048b..e97fc65995 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -547,22 +547,19 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) !NO!SUBS! ;; darwin*) - case "$osvers" in - [1-6].*) ;; - *) case "$ldflags" in - *"-flat_namespace"*) ;; - *) # to allow opmini.o to override stuff in libperl.dylib - namespaceflags="-force_flat_namespace" ;; - esac - ;; + 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 $spitshell >>Makefile <<'!NO!SUBS!' miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) -@rm -f miniperl.xok - $(CC) $(CLDFLAGS) $(namespaceflags) -o miniperl \ + $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest - $spitshell >>Makefile <<'!NO!SUBS!' !NO!SUBS! ;; *) diff --git a/hints/darwin.sh b/hints/darwin.sh index 92963a7579..a5e2c263dc 100644 --- a/hints/darwin.sh +++ b/hints/darwin.sh @@ -129,7 +129,8 @@ case "$osvers" in *) lddlflags="${ldflags} -bundle -undefined dynamic_lookup" case "$ld" in - '') ld='MACOSX_DEPLOYMENT_TARGET=10.3 ld' ;; + *MACOSX_DEVELOPMENT_TARGET*) ;; + *) ld="MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;; esac esac ldlibpthname='DYLD_LIBRARY_PATH'; |