diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-14 22:53:59 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-14 22:53:59 +0000 |
| commit | b33ef94dfdd0fbee94fcb8d82905f1fac67f858a (patch) | |
| tree | 797acc251cb477dd0094d57a519e1f69f0bf508c /libstdc++-v3 | |
| parent | 6508cdfd59e55601500a00834d6e843814e95d38 (diff) | |
| download | gcc-b33ef94dfdd0fbee94fcb8d82905f1fac67f858a.tar.gz | |
2000-12-14 Benjamin Kosnik <bkoz@fillmore.redhat.com>
* configure.in (CXX): Exit out if mknumeric_limits fails.
* mknumeric_limits (CXX): Use BUILD_DIR/g++, not g++ in
path. Consistency with tests_flags.in.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38262 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 7 | ||||
| -rw-r--r-- | libstdc++-v3/configure.in | 7 | ||||
| -rwxr-xr-x | libstdc++-v3/mknumeric_limits | 4 |
4 files changed, 20 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 54fd550e81c..194c33fd162 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2000-12-14 Benjamin Kosnik <bkoz@fillmore.redhat.com> + + * configure.in (CXX): Exit out if mknumeric_limits fails. + * mknumeric_limits (CXX): Use BUILD_DIR/g++, not g++ in + path. Consistency with tests_flags.in. + 2000-12-14 Benjamin Kosnik <bkoz@redhat.com> * include/c/bits/*.h: Remove include_next, replace with include, diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index fb3ece4abed..eba163b70d7 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -21021,7 +21021,12 @@ $srcdir/mkc++config $blddir $srcdir # Generate bits/std_limits.h and src/limitsMEMBERS.cc if test ! -f stamp-limits; then $srcdir/mknumeric_limits $blddir $srcdir $xcompiling - touch stamp-limits + if test ! -f include/bits/std_limits.h; then + echo "mknumeric_limits failed to execute properly: exiting" + exit 1 + else + touch stamp-limits + fi fi diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in index d8d5b3e5650..cc2533697b8 100644 --- a/libstdc++-v3/configure.in +++ b/libstdc++-v3/configure.in @@ -320,7 +320,12 @@ $srcdir/mkc++config $blddir $srcdir # Generate bits/std_limits.h and src/limitsMEMBERS.cc if test ! -f stamp-limits; then $srcdir/mknumeric_limits $blddir $srcdir $xcompiling - touch stamp-limits + if test ! -f include/bits/std_limits.h; then + echo "mknumeric_limits failed to execute properly: exiting" + exit 1 + else + touch stamp-limits + fi fi diff --git a/libstdc++-v3/mknumeric_limits b/libstdc++-v3/mknumeric_limits index a1ecc961aad..600d6f1662a 100755 --- a/libstdc++-v3/mknumeric_limits +++ b/libstdc++-v3/mknumeric_limits @@ -8,8 +8,6 @@ echo "running mknumeric_limits" -: ${CXX:=g++} - case `uname` in CYGWIN*) LDFLAGS='-nodefaultlibs -lcygwin -lc -lkernel32 -lgcc' ;; @@ -64,6 +62,8 @@ if [ $XCOMPILE -eq 1 ]; then exit 0; fi +: ${CXX:="$BUILD_DIR/../../gcc/g++ -B$BUILD_DIR/../../gcc/"} + cat <<EOF > $OUT_H // The template and inlines for the -*- C++ -*- numeric_limits classes. |