aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2010-12-16 14:44:23 -0700
committerEric Miao <eric.miao@linaro.org>2011-03-07 22:53:11 +0800
commit45b09c235dda460da1cab49c9a1b3e5a380931c6 (patch)
tree375c10b1f415c322f9909bed0afb8867097793c0
parentfc06f0783995dc585c022c6cf356e59d26c53d94 (diff)
downloadu-boot-linaro-natty-45b09c235dda460da1cab49c9a1b3e5a380931c6.tar.gz
LINARO: use default compiler again
With new upstrean no longer need to force gcc 4.4 Also change CROSS_COMPILE setting in rules to allow setting it in environment. Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules7
2 files changed, 3 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index fe29a4971..08a5c24f2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
Priority: extra
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: John Rigby <john.rigby@linaro.org>
-Build-Depends: debhelper (>= 7.0.50~), gcc-4.4
+Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.8.4
Vcs-Git: git://git.linaro.org/boot/u-boot-linaro-stable.git
diff --git a/debian/rules b/debian/rules
index 712f03536..96fe90307 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,9 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
+export CROSS_COMPILE?=$(DEB_HOST_GNU_TYPE)-
endif
-# u-boot breaks with gcc-4.5
-CC = $(CROSS_COMPILE)gcc-4.4
-
%:
dh $@
@@ -31,7 +28,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 CC="$(CC)"; \
+ $(MAKE) O=$$PWD/debian/build/$$plat; \
done <debian/platform-and-targets
override_dh_auto_install: