diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-12-15 00:19:17 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-12-15 00:19:17 +0100 |
| commit | 29a9d99b18ff793cf70ce8ebb8d0008f980f728b (patch) | |
| tree | 43af7e894ca23976004336606bcae9b14272c15e /toolchain/binutils/binutils.mk | |
| parent | a2fd9751155657999b75367dea5b081dad1254b3 (diff) | |
| parent | c375022823a1c36a03fe576924ef4fcf9a58499a (diff) | |
| download | buildroot-novena-29a9d99b18ff793cf70ce8ebb8d0008f980f728b.tar.gz buildroot-novena-29a9d99b18ff793cf70ce8ebb8d0008f980f728b.zip | |
Merge branch 'remove-external-toolchain' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'toolchain/binutils/binutils.mk')
| -rw-r--r-- | toolchain/binutils/binutils.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 8cddf2d50..288a000f5 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -22,6 +22,9 @@ endif ifeq ($(BINUTILS_VERSION),2.17) BINUTILS_SITE:=$(BR2_GNU_MIRROR)/binutils/ endif +ifeq ($(findstring avr32,$(BINUTILS_VERSION)),avr32) +BINUTILS_SITE:=ftp://www.at91.com/pub/buildroot/ +endif # We do not rely on the host's gmp/mpfr but use a known working one BINUTILS_HOST_PREREQ:= @@ -45,21 +48,15 @@ BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp="$(GMP_TARGET_DIR)" BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)" endif -BINUTILS_OFFICIAL_VERSION:=$(BINUTILS_VERSION)$(VENDOR_SUFFIX)$(VENDOR_BINUTILS_RELEASE) -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) BINUTILS_PATCH_DIR:=toolchain/binutils/$(BINUTILS_VERSION) -else # ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SOURCE),) -BINUTILS_SITE:=$(VENDOR_SITE) -BINUTILS_PATCH_DIR:=toolchain/binutils/ext_source/$(VENDOR_PATCH_DIR)/$(BINUTILS_OFFICIAL_VERSION) -endif ifneq ($(filter xtensa%,$(ARCH)),) include target/xtensa/patch.in BINUTILS_PATCH_EXTRA:=$(call XTENSA_PATCH,binutils,$(BINUTILS_PATCH_DIR),. ..) endif -BINUTILS_SOURCE:=binutils-$(BINUTILS_OFFICIAL_VERSION).tar.bz2 -BINUTILS_DIR:=$(TOOLCHAIN_DIR)/binutils-$(BINUTILS_OFFICIAL_VERSION) +BINUTILS_SOURCE:=binutils-$(BINUTILS_VERSION).tar.bz2 +BINUTILS_DIR:=$(TOOLCHAIN_DIR)/binutils-$(BINUTILS_VERSION) BINUTILS_CAT:=$(BZCAT) BINUTILS_DIR1:=$(TOOLCHAIN_DIR)/binutils-$(BINUTILS_VERSION)-build @@ -79,7 +76,9 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE) binutils-patched: $(BINUTILS_DIR)/.patched $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked # Apply appropriate binutils patches. +ifneq ($(wildcard $(BINUTILS_PATCH_DIR)),) toolchain/patch-kernel.sh $(BINUTILS_DIR) $(BINUTILS_PATCH_DIR) \*.patch $(BINUTILS_PATCH_EXTRA) +endif touch $@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched |