+2004-01-08 Eric Botcazou <ebotcazou@libertysurf.fr>
+
+ * ada/acats/run_acats: Treat 'gnatchop' the same way
+ as 'gnatmake'. Export GCC_DRIVER.
+ * ada/acats/run_all.sh: Add target_gnatchop. Use
+ 'host_gnatchop' and 'target_gnatchop' instead of 'gnatshop'.
+
2004-01-08 Giovanni Bajo <giovannibajo@gcc.gnu.org>
PR c++/12573
# 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}'`
ROOT=`${PWDCMD-pwd}`
BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`
exit 1
fi
+if [ ! -f $BASE/gnatchop ]; then
+ echo gnattools missing, exiting.
+ exit 1
+fi
+
if [ ! -f $BASE/gnatmake ]; then
echo gnattools missing, exiting.
exit 1
fi
+GCC_DRIVER="$BASE/xgcc"
GCC="$BASE/xgcc -B$BASE/"
-export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC
+export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_DRIVER GCC
+
+echo '#!/bin/sh' > host_gnatchop
+echo PATH=`dirname $host_gnatchop`:'$PATH' >> host_gnatchop
+echo unset ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_EXEC_PREFIX >> host_gnatchop
+echo export PATH >> host_gnatchop
+echo exec $host_gnatchop '"$@"' >> host_gnatchop
+
+chmod +x host_gnatchop
echo '#!/bin/sh' > host_gnatmake
echo PATH=`dirname $host_gnatmake`:'$PATH' >> host_gnatmake
exit 1
fi
+target_gnatchop () {
+ gnatchop --GCC="$GCC_DRIVER" $*
+}
+
target_gnatmake () {
gnatmake --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC"
}
cp -pr $testdir/tests $dir/
for i in $dir/support/*.ada $dir/support/*.a; do
- gnatchop $i >> $dir/acats.log 2>&1
+ host_gnatchop $i >> $dir/acats.log 2>&1
done
# These tools are used to preprocess some ACATS sources
exit 1
fi
-gnatchop *.adt >> $dir/acats.log 2>&1
+target_gnatchop *.adt >> $dir/acats.log 2>&1
target_gnatmake -c -gnato -gnatE *.ads > /dev/null 2>&1
target_gnatmake -c -gnato -gnatE *.adb
test=$dir/tests/$chapter/$i
mkdir $test
cd $test
- gnatchop -c -w `ls ${test}*.a ${test}*.ada ${test}*.adt ${test}*.am ${test}*.dep 2> /dev/null` >> $dir/acats.log 2>&1
+ target_gnatchop -c -w `ls ${test}*.a ${test}*.ada ${test}*.adt ${test}*.am ${test}*.dep 2> /dev/null` >> $dir/acats.log 2>&1
ls ${i}?.adb > ${i}.lst 2> /dev/null
ls ${i}*m.adb >> ${i}.lst 2> /dev/null
ls ${i}.adb >> ${i}.lst 2> /dev/null