g++spec.c (NEED_MATH_LIBRARY): Define to 1 if not already defined.

        * g++spec.c (NEED_MATH_LIBRARY): Define to 1 if not already defined.
        (lang_specific_driver): Initialize need_math with NEED_MATH_LIBRARY.
        (lang_specific_driver): Only add -lm automatically if need_math is
        nonzero.

From-SVN: r20765

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 46749387a0fc0b2fc991552db44f38bef69d26a2..ff6b55ab3bf8fd7894a4bb8863e8913e5ef38f47 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun 27 23:34:18 1998  Fred Fish  <fnf@ninemoons.com>
+
+       * g++spec.c (NEED_MATH_LIBRARY): Define to 1 if not already defined.
+       (lang_specific_driver): Initialize need_math with NEED_MATH_LIBRARY.
+       (lang_specific_driver): Only add -lm automatically if need_math is
+       nonzero.
+
 Sat Jun 27 12:22:56 1998  Jeffrey A Law  (law@cygnus.com)
 
         * Make-lang.in (g++): Depend on mkstemp.o.  Link in mkstemp.o

diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c
index ae9edf85461a1dc1dd38093bde8475947d4fc4e2..542ca06f889c93b52b0a0b49a900b948adecb025 100644 (file)
--- a/gcc/cp/g++spec.c
+++ b/gcc/cp/g++spec.c
@@ -34,6 +34,9 @@ Boston, MA 02111-1307, USA.  */
 #ifndef MATH_LIBRARY
 #define MATH_LIBRARY "-lm"
 #endif
+#ifndef NEED_MATH_LIBRARY
+#define NEED_MATH_LIBRARY 1    /* Default is pass MATH_LIBRARY to linker */
+#endif
 
 extern char *xmalloc PROTO((size_t));
 
@@ -81,7 +84,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
   int *args;
 
   /* By default, we throw on the math library.  */
-  int need_math = 1;
+  int need_math = NEED_MATH_LIBRARY;
 
   /* The total number of arguments with the new stuff.  */
   int argc;
@@ -241,7 +244,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries)
     }
   if (saw_math)
     arglist[j++] = saw_math;
-  else if (library)
+  else if (library && need_math)
     {
       arglist[j++] = MATH_LIBRARY;
       added_libraries++;