Remove obstacks.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / mkcheck.in

diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index 298fbae..1050de2 100755 (executable)
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -54,10 +54,14 @@ if [ $WHICH -eq 1 ]; then
 fi
 
 # INC_PATH == include path to new headers for use on gcc command-line
+C_DIR="`basename @C_INCLUDE_DIR@`"
 if [ $WHICH != "1" ]; then
-  INC_PATH="@CSHADOWFLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio -I$SRC_DIR/@ctype_include_dir@ -I$SRC_DIR/@cpu_include_dir@  -I$SRC_DIR/std -I$SRC_DIR -I$SRC_DIR/libio"
+  INC_PATH="@CSHADOW_FLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \
+    -I$SRC_DIR/include/std  -I$SRC_DIR/include/$C_DIR \
+    -I$SRC_DIR/include -I$SRC_DIR/libsupc++/include -I$SRC_DIR/libio \
+    -I$SRC_DIR/testsuite"
 elif [ $WHICH -eq 1 ]; then
-  INC_PATH=""
+  INC_PATH="-I$SRC_DIR/testsuite"
 fi
 
 if [ $WHICH -eq 2 ]; then
@@ -68,16 +72,18 @@ fi
 #LIB_PATH == where to find the build library binaries.
 if [ $WHICH != "1" ]; then
   LIB_PATH="$BUILD_DIR/src/.libs"
-  CXX="../../gcc/g++ -B../../gcc/"
+  CXX="../../gcc/g++"
+  CXX_BASE="-B../../gcc/"
 elif [ $WHICH -eq 1 ]; then
   LIB_PATH="$PREFIX_DIR/lib"
   CXX="$PREFIX_DIR/bin/g++"
+  CXX_BASE=""
 fi
 
 # gcc compiler flags
 #CXX_FLAG="-fsquangle -fhonor-std -fnew-exceptions -g -O2 -DDEBUG_ASSERT "
 #CXX_FLAG="-g -O2 -DDEBUG_ASSERT "
-CXX_FLAG="-g -DDEBUG_ASSERT @SECTION_FLAGS@ @SECTION_LDFLAGS@"
+CXX_FLAG="-g $CXX_BASE -DDEBUG_ASSERT @SECTION_FLAGS@ @SECTION_LDFLAGS@"
 
 # a specific flag(s) to force the use of shared libraries, if any
 SH_FLAG=""
@@ -146,7 +152,7 @@ chmod u+w $TEST_DIR/*.tst
 
 # Emit useful info about compiler and platform
 echo "host: $(uname -mrsv)" >> $RESULTS_FILE
-echo "compiler: $($CXX --version)" >> $RESULTS_FILE
+echo "compiler: $($CXX -v 2>&1 | tail -1)" >> $RESULTS_FILE
 echo "compiler flags: $CXX_FLAG" >> $RESULTS_FILE
 echo "date: $(date +%Y%m%d)" >> $RESULTS_FILE
 echo "" >> $RESULTS_FILE
@@ -356,6 +362,7 @@ mv ${RESULTS_FILE}.tmp $RESULTS_FILE
 if [ $TEST_TIME_START -lt $TEST_TIME_END ]; then
     TEST_TIME=$[ $TEST_TIME_END - $TEST_TIME_START ]
     echo "testrun == $TEST_TIME"
+    echo "testrun == $TEST_TIME" >> $RESULTS_FILE
 fi
 
 exit 0