tests_flags.in: Change the order of libstdc++ and libc

k

2001-03-26  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>

        * libstdc++-v3/tests_flags.in: Change the order of libstdc++
          and libc

From-SVN: r40876

libstdc++-v3/ChangeLog

+2001-03-26  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>
+
+        * libstdc++-v3/tests_flags.in: Change the order of libstdc++
+          and libc 
+
 2001-03-26  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/basic_file.h (get_fileno): Remove.

libstdc++-v3/tests_flags.in

@@ -104,9 +104,9 @@ case ${query} in
       INCLUDES="-I${SRC_DIR}/testsuite"
       ;;
     *)
-    INCLUDES="-nostdinc++ @CSHADOW_FLAGS@ -I${BUILD_DIR}/include
+      INCLUDES="-nostdinc++ -I${BUILD_DIR}/include -I${SRC_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}/libsupc++ -I${SRC_DIR}/libio 
 		-I${SRC_DIR}/testsuite"
       ;;
 esac
@@ -133,28 +133,31 @@ case ${query} in
       ;;
     --installed-library)
       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)
+# but that's really meant for building the library itself, not using it)
 CXXFLAGS="-ggdb3 -DDEBUG_ASSERT @SECTION_FLAGS@ @SECTION_LDFLAGS@"
 
 # LIBS == any extra needed -l switches, etc (may need more libs, lose lose)
 case ${query} in
     --built-library)
-    LIBS="${LIB_PATH}/libstdc++.la ${LIB_PATH}/../libsupc++/libsupc++.la 
-	    -no-install -rpath ${GCC_LIB_PATH}"
+      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 ${GCC_LIB_PATH}"
 	;;
 esac