diff options
| author | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-09-30 15:11:07 +0000 |
|---|---|---|
| committer | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-09-30 15:11:07 +0000 |
| commit | 8206a063cdc1c193b12df1a45cb3a0ee430b5077 (patch) | |
| tree | 45fb29ee11703ddeadeb8fa6d9673bc12d51394b /Makefile.SH | |
| parent | 2ddcc7aa6c936ba8e7a9703319dfd8959bb54574 (diff) | |
| parent | 3e3baf6d63945cb64e829d6e5c70a7d00f3d3d03 (diff) | |
| download | perl-8206a063cdc1c193b12df1a45cb3a0ee430b5077.tar.gz | |
Merge maint-5.004 branch (5.004_01) with mainline.
p4raw-id: //depot/perl@84
Diffstat (limited to 'Makefile.SH')
| -rw-r--r-- | Makefile.SH | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Makefile.SH b/Makefile.SH index dc5111a7b6..e18c3d6ba9 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -41,7 +41,14 @@ true) ;; aix*) shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" - shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib" + case "$osvers" in + 3*) + shrpldflags="$shrpldflags -e _nostart $ldflags $libs $cryptlib" + ;; + *) + shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib" + ;; + esac aixinstdir=`pwd | sed 's/\/UU$//'` linklibperl="-L $archlibexp/CORE -L $aixinstdir -lperl" ;; @@ -489,8 +496,15 @@ depend: makedepend makedepend: makedepend.SH config.sh sh ./makedepend.SH -check test: miniperl perl preplibrary $(dynamic_ext) - - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) && ./perl TEST </dev/tty +test-prep: miniperl perl preplibrary $(dynamic_ext) + cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) + +test check: test-prep + cd t && ./perl TEST </dev/tty + +# For testing without a tty or controling terminal. See t/op/stat.t +test-notty: test-prep + cd t && PERL_SKIP_TTY_TEST=1 ./perl TEST # Can't depend on lib/Config.pm because that might be where miniperl # is crashing. |