aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@codesourcery.com>2000-11-29 03:54:39 +0000
committerGabriel Dos Reis <gdr@gcc.gnu.org>2000-11-29 03:54:39 +0000
commita45a172a3668e08e5700155dd564029c95b6377a (patch)
treef87f7da0f7424c042eed1c54b14bb327238072c8
parent4bec9f7d6aef7b3d522d157f1daf368104616447 (diff)
downloadgcc-a45a172a3668e08e5700155dd564029c95b6377a.zip
gcc-a45a172a3668e08e5700155dd564029c95b6377a.tar.gz
gcc-a45a172a3668e08e5700155dd564029c95b6377a.tar.bz2
tests_flags (SH_FLAGS, ST_FLAGS): Move them back to ...
* tests_flags (SH_FLAGS, ST_FLAGS): Move them back to ... * mkcheck.in (SH_FLAGS, ST_FLAGS): ...here From-SVN: r37839
-rw-r--r--libstdc++-v3/ChangeLog5
-rwxr-xr-xlibstdc++-v3/mkcheck.in7
-rw-r--r--libstdc++-v3/tests_flags.in7
3 files changed, 12 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c873733..fd18cf9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2000-11-29 Gabriel Dos Reis <gdr@codesourcery.com>
+ * tests_flags (SH_FLAGS, ST_FLAGS): Move them back to ...
+ * mkcheck.in (SH_FLAGS, ST_FLAGS): ...here
+
+2000-11-29 Gabriel Dos Reis <gdr@codesourcery.com>
+
* src/Makefile.am (sources): Add bitset.cc
* src/Makefile.in: Regenrate.
diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index e27c4cc..83508e7 100755
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -56,6 +56,13 @@ set `./tests_flags ${query} $*` || exit 1
BUILD_DIR=$1; SRC_DIR=$2; PREFIX_DIR=$3; LTCXX=$4; LIBS=$5; LTEXE=$6; CXX=$7; CXXFLAGS=$8;
IFS=$saved_ifs
+# specific libtool flag(s) to force the use of shared libraries, if any
+SH_FLAGS=
+
+# specific libtool flag(s) to force the use of static libraries, if any
+ST_FLAGS="-static"
+#ST_FLAGS="-all-static"
+
# Set up the testing directory, which should be in a directory called
# "testsuite" in the root level of the build directory.
TEST_DIR="`pwd`/testsuite"
diff --git a/libstdc++-v3/tests_flags.in b/libstdc++-v3/tests_flags.in
index b44bb8c..3de5b4e 100644
--- a/libstdc++-v3/tests_flags.in
+++ b/libstdc++-v3/tests_flags.in
@@ -146,13 +146,6 @@ esac
# but thst's really meant for building the library itself, not using it)
CXXFLAGS="-ggdb3 -DDEBUG_ASSERT @SECTION_FLAGS@ @SECTION_LDFLAGS@"
-# specific libtool flag(s) to force the use of shared libraries, if any
-SH_FLAGS=
-
-# specific libtool flag(s) to force the use of static libraries, if any
-ST_FLAGS="-static"
-#ST_FLAGS="-all-static"
-
# LTCXX == how to call libtool when creating an executable
# LIBS == any extra needed -l switches, etc (may need more libs, lose lose)
case ${query} in