Use the approriate command for combining .o files.

This commit is contained in:
Dimitrie O. Paun 2000-12-05 04:13:36 +00:00 committed by Alexandre Julliard
parent 411e455624
commit 79e44abeed
3 changed files with 316 additions and 265 deletions

View File

@ -40,7 +40,7 @@ RANLIB = @RANLIB@
LN_S = @LN_S@ LN_S = @LN_S@
DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include
ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS) ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
LDCOMBINE = ld -r LDCOMBINE = @LDCOMBINE@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
AR = ar rc AR = ar rc
RM = rm -f RM = rm -f

570
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -68,6 +68,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_CHECK_PROG(C2MAN,c2man,c2man,\$(TOPSRCDIR)/tools/c2man.pl) AC_CHECK_PROG(C2MAN,c2man,c2man,\$(TOPSRCDIR)/tools/c2man.pl)
AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH) AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH)
AC_CYGWIN
dnl Check for lint dnl Check for lint
AC_CHECK_PROGS(LINT, lclint lint) AC_CHECK_PROGS(LINT, lclint lint)
@ -79,6 +80,14 @@ fi
AC_SUBST(LINT) AC_SUBST(LINT)
AC_SUBST(LINTFLAGS) AC_SUBST(LINTFLAGS)
if test "$CYGWIN" = "yes"
then
LDCOMBINE="ld -r --enable-stdcall-fixup"
else
LDCOMBINE="ld -r"
fi
AC_SUBST(LDCOMBINE)
dnl **** Check for some libraries **** dnl **** Check for some libraries ****
dnl Check for -lm for BeOS dnl Check for -lm for BeOS