2 files changed, 4 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index b8dde56ee..8d617adde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openssh (1:5.2p1-2) UNRELEASED; urgency=low
     - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd
       re-execs itself. Prevents two HUPs in quick succession from resulting
       in sshd dying (LP: #497781).
+  * Use host compiler for ssh-askpass-gnome when cross-compiling.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 10 Jan 2010 22:06:28 +0000
 
diff --git a/debian/rules b/debian/rules
index 0966a2e55..8bba8f95e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,10 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
   confflags += --build=$(DEB_HOST_GNU_TYPE)
+  CC := gcc
 else
   confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+  CC := $(DEB_HOST_GNU_TYPE)-gcc
 endif
 
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
@@ -125,7 +127,7 @@ endif
         perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h
 
         $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
-        $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc $(OPTFLAGS) -g -Wall'
+        $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(OPTFLAGS) -g -Wall'
         $(MAKE) -C debian/tests
 
         touch build-deb-stamp