From e48c38525bdd30917e4f474c2f6191e92171a6b5 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt <marcus@mc.pp.se>
Date: Wed, 29 Jul 1998 02:56:44 +0200
Subject: [PATCH] Added explicit libgcc ref for .so modules.
Rev: src/configure.in:1.224
Rev: src/modules/dynamic_module_makefile.in:1.42
---
src/configure.in | 29 +++++++++++++++++++++++++-
src/modules/dynamic_module_makefile.in | 5 +++--
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/configure.in b/src/configure.in
index 0e5c0f2122..95393ca3bc 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.223 1998/07/26 10:28:41 hubbe Exp $")
+AC_REVISION("$Id: configure.in,v 1.224 1998/07/29 00:56:43 marcus Exp $")
AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h)
@@ -54,6 +54,32 @@ AC_PROG_CC
AC_ISC_POSIX
AC_MINIX
+if test $ac_cv_prog_gcc = yes; then
+ AC_MSG_CHECKING(for libgcc file name)
+ AC_CACHE_VAL(pike_cv_libgcc_filename,
+ [
+ pike_cv_libgcc_filename="`${CC-cc} -print-libgcc-file-name`"
+ if test -z "$pike_cv_libgcc_filename"; then
+ pike_cv_libgcc_filename=no
+ else
+ if test -f "$pike_cv_libgcc_filename"; then
+ :
+ else
+ pike_cv_libgcc_filename=no
+ fi
+ fi
+ ])
+ AC_MSG_RESULT($pike_cv_libgcc_filename)
+ if test x"$pike_cv_libgcc_filename" = xno; then
+ LIBGCC=""
+ else
+ LIBGCC="$pike_cv_libgcc_filename"
+ fi
+else
+ LIBGCC=""
+fi
+AC_SUBST(LIBGCC)
+
#############################################################################
LIBDIR=`(cd $srcdir/../lib ; pwd)`
@@ -2535,6 +2561,7 @@ echo "CPPFLAGS: $CPPFLAGS"
echo "CFLAGS: $CFLAGS"
echo "CCSHARED: $CCSHARED"
echo "LINKFORSHARED: $LINKFORSHARED"
+echo "LIBGCC: $LIBGCC"
echo "WARN: $WARN"
echo "OPTIMIZE: $OPTIMIZE"
echo "LDFLAGS: $LDFLAGS"
diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index 545393c579..912dfa35dd 100644
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -1,11 +1,12 @@
#
-# $Id: dynamic_module_makefile.in,v 1.41 1998/07/09 13:33:01 grubba Exp $
+# $Id: dynamic_module_makefile.in,v 1.42 1998/07/29 00:56:44 marcus Exp $
#
CC=@CC@
CPP=@CPP@
AR=@AR@
+LIBGCC=@LIBGCC@
PREFLAGS=-I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../.. -I. $(MODULE_CPPFLAGS) $(DEFINES) -DDYNAMIC_MODULE
CFLAGS=$(PREFLAGS) $(OTHERFLAGS) @CCSHARED@ $(MODULE_CFLAGS)
@@ -48,7 +49,7 @@ config.status: $(SRCDIR)/configure
./config.status --recheck
module.so: $(OBJS) $(MODULE_ARCHIVES)
- $(TMP_BINDIR)/smartlink "@LDSHARED@" -o module.@SO@ $(OBJS) $(MODULE_ARCHIVES) $(MODULE_LDFLAGS) -lc
+ $(TMP_BINDIR)/smartlink "@LDSHARED@" -o module.@SO@ $(OBJS) $(MODULE_ARCHIVES) $(MODULE_LDFLAGS) $(LIBGCC) -lc $(LIBGCC)
if test @SO@ != so ; then mv module.@SO@ module.so ; else :; fi
clean:
--
GitLab