diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2011-01-27 13:55:00 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2011-01-27 13:55:00 +0000 |
| commit | c82aa42db64cfc166a1aa5236674acdfce9ae22b (patch) | |
| tree | f5c5572bd7bb61a31ce3b94cc41b7c80f793fab5 /toolchain | |
| parent | 20fbe608b44ab102677c646c51800d4a4209068d (diff) | |
| download | upstream-c82aa42db64cfc166a1aa5236674acdfce9ae22b.tar.gz upstream-c82aa42db64cfc166a1aa5236674acdfce9ae22b.tar.bz2 upstream-c82aa42db64cfc166a1aa5236674acdfce9ae22b.zip | |
cleanup toolchain version handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25148 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/eglibc/Config.in | 4 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 2 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 11 | ||||
| -rw-r--r-- | toolchain/gcc/common.mk | 8 |
4 files changed, 4 insertions, 21 deletions
diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in index 2ae8da3e85..62ed24da91 100644 --- a/toolchain/eglibc/Config.in +++ b/toolchain/eglibc/Config.in @@ -22,11 +22,11 @@ choice config EGLIBC_VERSION_2_11 bool "eglibc 2.11" - depends GCC_VERSION_4_3 || GCC_VERSION_4_4 || GCC_VERSION_4_5 + depends !GCC_VERSION_LLVM config EGLIBC_VERSION_2_12 bool "eglibc 2.12" - depends GCC_VERSION_4_3 || GCC_VERSION_4_4 || GCC_VERSION_4_5 + depends !GCC_VERSION_LLVM config EGLIBC_VERSION_TRUNK bool "eglibc trunk" diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index cd4f3e25e9..019cd164b7 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -78,7 +78,7 @@ config INSTALL_LIBSTDCPP config INSTALL_LIBGCJ bool - depends on !GCC_VERSION_4_2 + depends on !GCC_VERSION_LLVM prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS default n help diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index a39c0e88a9..fe1a7570ab 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -9,17 +9,6 @@ config GCC_VERSION default "llvm" if GCC_VERSION_LLVM default "4.5.1+l" -config GCC_VERSION_4 - bool - default y if GCC_VERSION_4_2 - default y if GCC_VERSION_4_3 - default y if GCC_VERSION_4_4 - default y if GCC_VERSION_4_5 - -config GCC_VERSION_4_2 - bool - default y if GCC_VERSION_LLVM - config GCC_VERSION_4_3 bool default y if GCC_VERSION_4_3_3_CS diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 4d0cafa409..977a104d00 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -48,12 +48,6 @@ else PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 - ifeq ($(PKG_VERSION),4.1.2) - PKG_MD5SUM:=a4a3eb15c96030906d8494959eeda23c - endif - ifeq ($(PKG_VERSION),4.2.4) - PKG_MD5SUM:=d79f553e7916ea21c556329eacfeaa16 - endif ifeq ($(PKG_VERSION),4.3.3) PKG_MD5SUM:=cc3c5565fdb9ab87a05ddb106ba0bd1f endif @@ -126,7 +120,7 @@ ifneq ($(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5),) endif endif -ifneq ($(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5),) +ifeq ($(CONFIG_GCC_LLVM),) GCC_BUILD_TARGET_LIBGCC:=y GCC_CONFIGURE+= \ --with-gmp=$(TOPDIR)/staging_dir/host \ |