aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Minier <loic.minier@linaro.org>2010-12-16 14:36:49 -0700
committerEric Miao <eric.miao@linaro.org>2011-03-07 22:53:10 +0800
commit77373807fed91ecf6e6981175887567f46c27385 (patch)
tree09944ac73a6d07a5234d261ce0313f0b8b178d94
parentb8f2f3a1e97916fc2c46fdfcad815574bc792acc (diff)
downloadu-boot-linaro-natty-77373807fed91ecf6e6981175887567f46c27385.tar.gz
LINARO: Pass CC to make to force gcc-4.4
Signed-off-by: Loïc Minier <loic.minier@linaro.org>
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules4
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index dad09efed..cd45f1a97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+u-boot-linaro (2010.09~rc1.1-0ubuntu6) natty; urgency=low
+
+ * Pass CC to make to force gcc-4.4.
+
+ -- Loïc Minier <loic.minier@ubuntu.com> Thu, 16 Dec 2010 01:40:01 +0100
+
u-boot-linaro (2010.09~rc1.1-0ubuntu5) natty; urgency=low
* Build with gcc-4.4 for now as 4.5 breaks u-boot for some reason.
diff --git a/debian/rules b/debian/rules
index fea4ddf43..712f03536 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
endif
# u-boot breaks with gcc-4.5
-export CC=$(CROSS_COMPILE)gcc-4.4
+CC = $(CROSS_COMPILE)gcc-4.4
%:
dh $@
@@ -31,7 +31,7 @@ override_dh_auto_build:
mkdir -p debian/build/$$plat; \
$(MAKE) O=$$PWD/debian/build/$$plat $${plat}_config; \
find debian/build; \
- $(MAKE) O=$$PWD/debian/build/$$plat; \
+ $(MAKE) O=$$PWD/debian/build/$$plat CC="$(CC)"; \
done <debian/platform-and-targets
override_dh_auto_install: