* Makefile.in (install-headers): Remove redundant dependency.

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

diff --git a/libstdc++-v3/tests_flags.in b/libstdc++-v3/tests_flags.in
index b82fe56..9377844 100644 (file)
--- a/libstdc++-v3/tests_flags.in
+++ b/libstdc++-v3/tests_flags.in
@@ -23,8 +23,8 @@
 #      needed to run library specific tests,
 #      BUILD_DIR:SRC_DIR:PREFIX_DIR:CXX:CXXFLAGS:INCLUDES:LIBS 
 #      the meaning of which is as follows:
-#        BUILD_DIR   build-dir
-#        SRC_DIR     src-dir
+#        BUILD_DIR   libstdc++-v3 build-dir
+#        SRC_DIR     libstdc++-v3 src-dir
 #        PREFIX_DIR  install-dir (meaningful only with --installed-library)
 #        CXX         which C++ compiler is being used
 #        CXXFLAGS    special flags to pass to g++
@@ -56,7 +56,7 @@ check_options() {
     
     # Then, see if we understand the job we're asked for
     case $2 in
-       --compiler|--built-library|--installed-library)
+       --compiler | --built-library | --installed-library)
        # OK
        ;;
        *) 
@@ -88,74 +88,81 @@ check_directory 'Build' ${BUILD_DIR}
 check_directory 'Source' ${SRC_DIR}
 case ${query} in
     --installed-library)
-    PREFIX_DIR=$4
-    check_directory 'Install' ${PREFIX_DIR}
-    ;;
+      PREFIX_DIR=$4
+      check_directory 'Install' ${PREFIX_DIR}
+      ;;
     *)
-    PREFIX_DIR=
-    ;;
+      PREFIX_DIR=
+      ;;
 esac
 
 # Compute include paths
 # INCLUDES == include path to new headers for use on gcc command-line
-top_srcdir=@top_srcdir@
 C_DIR="`basename  @C_INCLUDE_DIR@`"
 case ${query} in
     --installed-library)
-    INCLUDES="-I${SRC_DIR}/testsuite"
-    ;;
+      INCLUDES="-I${SRC_DIR}/testsuite"
+      ;;
     *)
-    INCLUDES="-nostdinc++ @CSHADOW_FLAGS@ -I${BUILD_DIR}/include
-             -I${SRC_DIR}/include/std  -I${SRC_DIR}/include/$C_DIR
-             -I${SRC_DIR}/include -I${SRC_DIR}/libsupc++ -I${SRC_DIR}/libio 
-             -I${SRC_DIR}/testsuite"
-    ;;
+      INCLUDES="-nostdinc++ -I${BUILD_DIR}/include -I${SRC_DIR}/include
+                -I${SRC_DIR}/include/std  -I${SRC_DIR}/include/$C_DIR
+               -I${SRC_DIR}/libsupc++ -I${SRC_DIR}/libio 
+               -I${SRC_DIR}/testsuite"
+      if test x@xcompiling@ = x1; then
+        INCLUDES="${INCLUDES} -I${SRC_DIR}/../newlib/libc/include"
+      fi
+      ;;
 esac
 
 # If called for compiler tests, just output appropriate include paths
 case ${query} in
     --compiler)
-    echo ${INCLUDES} -I${SRC_DIR}/include/backward -I${SRC_DIR}/include/ext
-    exit 0
-    ;;
+      echo ${INCLUDES} -I${SRC_DIR}/include/backward -I${SRC_DIR}/include/ext
+      exit 0
+      ;;
 esac
 
 # For built or installed libraries, we need to get right OS-specific bits.
-. ${top_srcdir}/configure.target
+. ${SRC_DIR}/configure.target
 
-# LIB_PATH == where to find the build libraries for libtool's use
-# CXX == the full pathname of the compiler
+# LIB_PATH == where to find the C++ build libraries for libtool's use
+# GCC_LIB_PATH == where to find the gcc build libraries for libtool's use
+# CXX == how to invoke the compiler
 case ${query} in
     --built-library)
-    LIB_PATH=${BUILD_DIR}/src
-    CXX="${BUILD_DIR}/../../gcc/g++"
-    ;;
+      LIB_PATH=${BUILD_DIR}/src
+      GCC_LIB_PATH=${BUILD_DIR}/../../gcc
+      CXX='@glibcpp_CXX@'
+      ;;
     --installed-library)
-    LIB_PATH=${PREFIX_DIR}/lib
-    CXX=${PREFIX_DIR}/bin/g++
-    ;;
+      LIB_PATH=${PREFIX_DIR}/lib
+      GCC_LIB_PATH=
+      CXX=${PREFIX_DIR}/bin/g++
+      ;;
 esac
 
-# gcc compiler flags (maybe use glibcpp_cxxflags from configure.target,
-# but thst's really meant for building the library itself, not using it)
+# CXXFLAGS == run the testsuite with any special configuration
+# flags from the library build.
 CXXFLAGS="-ggdb3 -DDEBUG_ASSERT @SECTION_FLAGS@ @SECTION_LDFLAGS@"
 
-# LIBS == any extra needed -l switches, etc (may need more libs, lose lose)
+# LIBS == any extra may needed -L switches
 case ${query} in
     --built-library)
-    LIBS="${LIB_PATH}/../libsupc++/libsupc++.la ${LIB_PATH}/libstdc++.la
-           -no-install"
+      LIBS="${LIB_PATH}/libstdc++.la -no-install -rpath ${GCC_LIB_PATH}"
     case @target_os@ in
-        *cygwin*)  LIBS="${LIBS} -nodefaultlibs -lgcc -lcygwin -luser32
-                         -lkernel32 -ladvapi32 -lshell32" ;;
-        *)         LIBS="${LIBS} -nodefaultlibs -lc -lgcc -lc" ;;
+        *cygwin*)  
+         LIBS="${LIBS} -nodefaultlibs -lgcc -lcygwin -luser32
+                -lkernel32 -ladvapi32 -lshell32" 
+         ;;
+        *)         
+         LIBS="${LIBS} -nodefaultlibs -lgcc -lc -lgcc" 
+         ;;
     esac
     ;;
     --installed-library)
-    LIBS="-L${LIB_PATH} ${LIB_PATH}/libstdc++.la -no-install
-           -rpath ${LIB_PATH}"
-    ;;
+       LIBS="${LIB_PATH}/libstdc++.la -no-install -rpath ${LIB_PATH}"
+       ;;
 esac
 
-echo -n ${BUILD_DIR}:${SRC_DIR}:${PREFIX_DIR}:${CXX}:${CXXFLAGS}:${INCLUDES}:${LIBS}
+echo ${BUILD_DIR}:${SRC_DIR}:${PREFIX_DIR}:${CXX}:${CXXFLAGS}:${INCLUDES}:${LIBS}
 exit 0