Revert "debian/rules: Set CC/LD to enable cross-building"

This reverts commit 900c79958963e72192fbf3654b38a5c7f8353176.

Unfortunately, this change causes an FTBFS on i386, because what we need
to call on i386 is i686-linux-gnu-gcc. Sigh.

For now, revert the change, so we can get the security updates out.
Later we will have to see how to properly fix this.

Signed-off-by: Hans van Kranenburg <hans@knorrie.org>

diff --git a/debian/rules b/debian/rules
index c7c7f916b4f7f319c130490aa5e6aa94a3d57330..a0e269c36f8c6a6572e41f4754ee0135ecd422e1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -135,8 +135,6 @@ dpkg_CPPFLAGS := $(shell $(dbmo) dpkg-buildflags --get CPPFLAGS)
 dpkg_LDFLAGS  := $(shell $(dbmo) dpkg-buildflags --get LDFLAGS)
 
 make_args_common := \
-       CC=$(DEB_HOST_MULTIARCH)-gcc \
-       LD=$(DEB_HOST_MULTIARCH)-ld \
        XEN_COMPILE_ARCH=$(xen_arch_$(DEB_BUILD_ARCH)) \
        V=1