---
 Makefile.in  |    5 ++++-
 configure.in |   12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

Index: Makefile.in
===================================================================
--- Makefile.in.orig
+++ Makefile.in
@@ -9,10 +9,13 @@ mandir=@mandir@
 
 LIBS=@LIBS@
 CC=@CC@
+CC_FOR_BUILD=@CC_FOR_BUILD@
 CFLAGS=@CFLAGS@
+CFLAGS_FOR_BUILD=@CFLAGS_FOR_BUILD@
 CPPFLAGS=@CPPFLAGS@
 EXEEXT=@EXEEXT@
 LDFLAGS=@LDFLAGS@
+LDFLAGS_FOR_BUILD=@LDFLAGS_FOR_BUILD@
 
 INSTALLCMD=@INSTALL@
 INSTALLMAN=@INSTALL@
@@ -85,7 +88,7 @@ rounding.h: mkrounding$(EXEEXT)
 
 mkrounding$(EXEEXT): mkrounding.c rsync.h
 	@sed '1,/^struct file_struct/d; /^}/,$$d' <$(srcdir)/rsync.h >mkrounding.h
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -I. $(srcdir)/mkrounding.c
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ -I. $(srcdir)/mkrounding.c
 	@rm mkrounding.h
 
 tls$(EXEEXT): $(TLS_OBJ)
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -23,6 +23,18 @@ AC_PROG_INSTALL
 AC_PROG_CC_STDC
 AC_SUBST(SHELL)
 
+# build tools for cross compiling
+if test "x$cross_compiling" = "xno"; then
+        CC_FOR_BUILD=${CC_FOR_BUILD-${CC-gcc}}
+else
+        CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+fi
+CFLAGS_FOR_BUILD=-O2
+LDFLAGS_FOR_BUILD=
+AC_SUBST(CC_FOR_BUILD)
+AC_SUBST(CFLAGS_FOR_BUILD)
+AC_SUBST(LDFLAGS_FOR_BUILD)
+
 AC_DEFINE([_GNU_SOURCE], 1,
           [Define _GNU_SOURCE so that we get all necessary prototypes])