diff src/Makefile.in @ 108507:ea7b1bab920f

Move LIB_GCC from cpp to configure. * configure.in (LIB_GCC): New output variable. * src/Makefile.in (LIB_GCC): Set using configure, not cpp. (GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC. * src/m/arm.h (LIB_GCC) [GNU_LINUX]: * src/s/cygwin.h (LIB_GCC): * src/s/freebsd.h (LIB_GCC): * src/s/gnu-linux.h (LIB_GCC): * src/s/msdos.h (LIB_GCC): * src/s/netbsd.h (LIB_GCC): Move to configure. * msdos/sed1v2.inp (LIB_GCC): Edit to -Lgcc.
author Glenn Morris <rgm@gnu.org>
date Tue, 11 May 2010 20:01:16 -0700
parents d89b565897dd
children b9450230de5c
line wrap: on
line diff
--- a/src/Makefile.in	Tue May 11 19:37:59 2010 -0700
+++ b/src/Makefile.in	Tue May 11 20:01:16 2010 -0700
@@ -91,6 +91,9 @@
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM=@LIBS_SYSTEM@
 
+## Where to find libgcc.a, if using gcc and necessary.
+LIB_GCC=@LIB_GCC@
+
 LIBTIFF=@LIBTIFF@
 LIBJPEG=@LIBJPEG@
 LIBPNG=@LIBPNG@
@@ -258,6 +261,8 @@
 #endif /* not HAVE_X_WINDOWS */
 
 #ifndef ORDINARY_LINK
+GNULIB_VAR = $(LIB_GCC)
+
 /* Fix linking if compiled with GCC.  */
 #ifdef __GNUC__
 
@@ -278,13 +283,6 @@
 #define LINKER $(CC) -nostdlib
 #endif
 
-#ifndef LIB_GCC
-/* Ask GCC where to find libgcc.a.  */
-#define LIB_GCC `$(CC) -print-libgcc-file-name`
-#endif /* not LIB_GCC */
-
-GNULIB_VAR = LIB_GCC
-
 #ifndef LINKER_WAS_SPECIFIED
 /* GCC passes any argument prefixed with -Xlinker directly to the
    linker.  See prefix-args.c for an explanation of why we do not do
@@ -296,10 +294,6 @@
 #define YMF_PASS_LDFLAGS(flags) flags
 #endif
 
-#else /* not __GNUC__ */
-GNULIB_VAR =
-
-#endif /* not __GNUC__ */
 #endif /* not ORDINARY_LINK */
 
 #ifdef ORDINARY_LINK