diff options
| author | Ulrich Weigand <Ulrich.Weigand@de.ibm.com> | 2010-05-18 07:58:36 +0000 |
|---|---|---|
| committer | Ulrich Weigand <Ulrich.Weigand@de.ibm.com> | 2010-05-18 07:58:36 +0000 |
| commit | 47a1fbc84b859f76b667981823142c1d9db0a1d9 (patch) | |
| tree | 1498312fa2d4548df4eb68430cb1ac244ff3b530 /gcc/testsuite/ada/acats/run_acats | |
| parent | 6fe542eedfca85788635c35f69d56cb7aef39da0 (diff) | |
Update to gcc-4_4-branch revision 159486.cell-4_4-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/cell-4_4-branch@159526 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/ada/acats/run_acats')
| -rwxr-xr-x | gcc/testsuite/ada/acats/run_acats | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats index 05f3ff57df5..9a9bdc2a318 100755 --- a/gcc/testsuite/ada/acats/run_acats +++ b/gcc/testsuite/ada/acats/run_acats @@ -5,10 +5,25 @@ if [ "$testdir" = "" ]; then exit 1 fi +# Provide which replacement. +# +# type -p is missing from Solaris 2 /bin/sh and /bin/ksh (ksh88), but both +# ksh93 and bash have it. +# type output format differs between ksh88 and ksh93, so avoid it if +# type -p is present. +# Fall back to whence which ksh88 and ksh93 provide, but bash does not. + +which () { + type -p $* 2>/dev/null && return 0 + type $* 2>/dev/null | awk '{print $3}' && return 0 + whence $* 2>/dev/null && return 0 + return 1 +} + # Set up environment to use the Ada compiler from the object tree -host_gnatchop=`type gnatchop | awk '{print $3}'` -host_gnatmake=`type gnatmake | awk '{print $3}'` +host_gnatchop=`which gnatchop` +host_gnatmake=`which gnatmake` ROOT=`${PWDCMD-pwd}` BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}` |