X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f4d3cba607d04932838ed0ba4aac287138cf32f7..fdb4676b62cc83746e2131011b142ea05b5ed1f8:/toolchain/gcc/common.mk

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index a24cc8bd8..75ad8af6f 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -36,12 +36,21 @@ ifdef CONFIG_GCC_VERSION_LLVM
   PKG_SOURCE_SUBDIR:=$(GCC_DIR)
   HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR)
 else
-ifeq ($(CONFIG_GCC_VERSION),"4.5-linaro")
-    PKG_REV:=4.5-2011.08
-    PKG_VERSION:=4.5.4
-    PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/4.5/$(PKG_REV)/+download/
+ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
+    ifeq ($(CONFIG_GCC_VERSION),"4.5-linaro")
+      PKG_REV:=4.5-2011.08
+      PKG_VERSION:=4.5.4
+      PKG_VERSION_MAJOR:=4.5
+      PKG_MD5SUM:=c3374e210209e35ad1ea175223d3605c
+    endif
+    ifeq ($(CONFIG_GCC_VERSION),"4.6-linaro")
+      PKG_REV:=4.6-2011.08
+      PKG_VERSION:=4.6.2
+      PKG_VERSION_MAJOR:=4.6
+      PKG_MD5SUM:=7417cdb33d7b3a18552b2003a98cadfc
+    endif
+    PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/$(PKG_VERSION_MAJOR)/$(PKG_REV)/+download/
     PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.bz2
-    PKG_MD5SUM:=c3374e210209e35ad1ea175223d3605c
     GCC_DIR:=gcc-linaro-$(PKG_REV)
     HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR)
 else