Skip to content
Snippets Groups Projects
Commit 79e44abe authored by Dimitrie O. Paun's avatar Dimitrie O. Paun Committed by Alexandre Julliard
Browse files

Use the approriate command for combining .o files.

parent 411e4556
No related branches found
No related tags found
No related merge requests found
......@@ -40,7 +40,7 @@ RANLIB = @RANLIB@
LN_S = @LN_S@
DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include
ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
LDCOMBINE = ld -r
LDCOMBINE = @LDCOMBINE@
LDFLAGS = @LDFLAGS@
AR = ar rc
RM = rm -f
......
This diff is collapsed.
......@@ -68,6 +68,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_CHECK_PROG(C2MAN,c2man,c2man,\$(TOPSRCDIR)/tools/c2man.pl)
AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH)
AC_CYGWIN
dnl Check for lint
AC_CHECK_PROGS(LINT, lclint lint)
......@@ -79,6 +80,14 @@ fi
AC_SUBST(LINT)
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 -lm for BeOS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment