From 487f145008ff00d3d03b0aa1f6d6bcea4a84a404 Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <gdr@merlin.codesourcery.com>
Date: Fri, 23 Feb 2001 09:30:47 +0000
Subject: [PATCH] Remove special-casing on target.
Remove special-casing on target. Use gcc instead of g++ to build
gen-num-limits.cc
From-SVN: r39994
---
libstdc++-v3/ChangeLog | 5 +++++
libstdc++-v3/mknumeric_limits | 27 +++++----------------------
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 92887bd863a5..a8f35aa37817 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-23 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
+
+ * mknumeric_limits: Remove special-casing on target. Use gcc
+ instead of g++ to build gen-num-limits.cc
+
2001-02-22 Benjamin Kosnik <bkoz@redhat.com>
* tests_flags.in (CXXFLAGS): Add -rpath to gcc build dir.
diff --git a/libstdc++-v3/mknumeric_limits b/libstdc++-v3/mknumeric_limits
index 918743f30d3e..ec7a61b9feb3 100755
--- a/libstdc++-v3/mknumeric_limits
+++ b/libstdc++-v3/mknumeric_limits
@@ -8,21 +8,6 @@
echo "running mknumeric_limits"
-case `uname` in
- CYGWIN*)
- LDFLAGS='-nodefaultlibs -lcygwin -lc -lkernel32 -lgcc' ;;
- AIX*)
- case $CXX in
- *pthread*)
- LDFLAGS='-nodefaultlibs -lgcc -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a' ;;
- *)
- LDFLAGS='-nodefaultlibs -lgcc -lc' ;;
- esac
- ;;
- *)
- LDFLAGS='-nodefaultlibs -lgcc -lc' ;;
-esac
-
BUILD_DIR=$1
if [ ! -d "$BUILD_DIR" ]; then
echo "build directory $BUILD_DIR not found, exiting."
@@ -62,7 +47,7 @@ if [ $XCOMPILE -eq 1 ]; then
exit 0;
fi
-: ${CXX:="$BUILD_DIR/../../gcc/g++ -B$BUILD_DIR/../../gcc/"}
+: ${CC:="$BUILD_DIR/../../gcc/gcc -B$BUILD_DIR/../../gcc/"}
# We output to a temporary file, so that we don't appear to have
# succeeded unless we actually do.
@@ -178,13 +163,11 @@ namespace std {
EOF
-echo "$CXX -I. $CPPFLAGS -I$BUILD_DIR/include -DHAVE_CONFIG_H \
- -o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc" \
- $LDFLAGS"
+echo "$CC -I. $CPPFLAGS -I$BUILD_DIR/include -DHAVE_CONFIG_H \
+ -o $BUILD_DIR/src/gen-num-limits $SRC_DIR/src/gen-num-limits.cc"
-{ $CXX -I. $CPPFLAGS -I$BUILD_DIR/include -DHAVE_CONFIG_H \
- -o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc" \
- $LDFLAGS
+{ $CC -I. $CPPFLAGS -I$BUILD_DIR/include -DHAVE_CONFIG_H \
+ -o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc"
} || {
echo "gen-num-limits failed to build, exiting."
exit 1
--
GitLab