[kernel] r6535 - people/waldi/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Mon May  8 17:20:02 2006
New Revision: 6535

Modified:
   people/waldi/linux-2.6/debian/rules.real

Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Mon May  8 17:20:02 2006
@@ -48,12 +48,13 @@
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
   setup_makeflags += CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
   ifdef COMPILER
-    override COMPILER := $(DEB_HOST_GNU_TYPE)-$(COMPILER)
+    setup_makeflags += CC=$(DEB_HOST_GNU_TYPE)-$(COMPILER)
   endif
   kpkg_image += --cross-compile='$(DEB_HOST_GNU_TYPE)'
-endif
-ifdef COMPILER
-  setup_makeflags += CC=$(COMPILER)
+else
+  ifdef COMPILER
+    setup_makeflags += CC=$(COMPILER)
+  endif
 endif
 setup_env += MAKEFLAGS='$(setup_makeflags)'