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 | 50be0201f13e198250ae1eed9cf89fb138cf7028 (patch) | |
| tree | bd5060a305dc1dee9219657d361bf8c8a94833d2 | |
| parent | a844918eadee68ac3744576a61c2002131866741 (diff) | |
| download | mtk-20170518-50be0201f13e198250ae1eed9cf89fb138cf7028.zip mtk-20170518-50be0201f13e198250ae1eed9cf89fb138cf7028.tar.gz mtk-20170518-50be0201f13e198250ae1eed9cf89fb138cf7028.tar.bz2 | |
cleanup toolchain version handling
SVN-Revision: 25148
| -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 | ||||
| -rw-r--r-- | tools/Makefile | 6 |
5 files changed, 7 insertions, 24 deletions
diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in index 2ae8da3..62ed24d 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 cd4f3e2..019cd16 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 a39c0e8..fe1a757 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 4d0cafa..977a104 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 \ diff --git a/tools/Makefile b/tools/Makefile index 7013939..d8e7bfd 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,8 +10,8 @@ curdir:=tools # subdirectories to descend into tools-y := -ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) -tools-$(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5) += gmp mpfr +ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN)$(CONFIG_GCC_LLVM),) +tools-y += gmp mpfr tools-$(CONFIG_GCC_VERSION_4_5) += mpc libelf endif tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs @@ -107,5 +107,5 @@ $(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($( $(curdir)/ := .config prereq $(curdir)//install = $(1)/compile -$(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_3 CONFIG_GCC_USE_GRAPHITE CONFIG_TARGET_orion_generic)) +$(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_5 CONFIG_GCC_USE_GRAPHITE CONFIG_TARGET_orion_generic)) $(eval $(call subdir,$(curdir))) |