Fix cross-compiling on karmic and lucid.

[nss_nonlocal.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 0598e896fa8c3981a7ab42949e9c149093c1702c..24e5e551cdc456f61513e975e9a035a1cff2d47c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,6 @@ DEB_AUTO_UPDATE_AUTOMAKE = 1.9
 DEB_AUTO_UPDATE_ACLOCAL = 1.9
 DEB_AUTO_UPDATE_LIBTOOL = pre
 
-# Fix http://bugs.debian.org/576967 : CDBS 0.4.77 in squeeze
-# incorrectly splits multiword $(CC) and $(CXX).
-override cdbs_set_nondefaultvars = $(foreach var,$1,$(if $(filter-out $(origin $(var)),default),$(var)='$($(var))'))
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
@@ -65,6 +61,9 @@ configure/lib64nss-nonlocal:: CC += -m64 -D__x86_64__
 # amd64_slibdir in eglibc/debian/sysdeps/i386.mk
 configure/lib64nss-nonlocal:: DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib64"
 
+# Fix for CDBS ≥ 0.4.59ubuntu4, < 0.4.83ubuntu1 (karmic and lucid).
+configure/lib32nss-nonlocal configure/lib64nss-nonlocal:: DEB_CONFIGURE_SCRIPT_ENV += CC="$(CC)"
+
 configure/lib32nss-nonlocal configure/lib64nss-nonlocal::
        $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS)