KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

get rid of gcc 4.1.2 and 4.2.4 support

Browse source 
SVN-Revision: 25144
This commit is contained in:
Imre Kaloz 2011-01-27 13:24:38 +00:00
parent 444541f6f8
commit 25fb11cf89
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/uci/Makefile
View file

@ -65,11 +65,6 @@ UCI_MAKEOPTS = \
FPIC="$(FPIC)" \ FPIC="$(FPIC)" \
OS="Linux" OS="Linux"
# work around a nasty gcc bug
ifneq ($(CONFIG_GCC_VERSION_4_2_4),)
UCI_MAKEOPTS += WOPTS=""
endif
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS) $(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
$(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS) $(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)

8
toolchain/gcc/Config.in
View file

@ -12,12 +12,6 @@ choice
help help
Select the version of gcc you wish to use. Select the version of gcc you wish to use.
config GCC_VERSION_4_1_2
bool "gcc 4.1.2"
config GCC_VERSION_4_2_4
bool "gcc 4.2.4"
config GCC_VERSION_4_3_5 config GCC_VERSION_4_3_5
bool "gcc 4.3.5" bool "gcc 4.3.5"
@ -84,7 +78,7 @@ config INSTALL_LIBSTDCPP
config INSTALL_LIBGCJ config INSTALL_LIBGCJ
bool bool
depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2) depends on !GCC_VERSION_4_2
prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
default n default n
help help

8
toolchain/gcc/Config.version
View file

@ -1,7 +1,5 @@
config GCC_VERSION config GCC_VERSION
string string
default "4.1.2" if GCC_VERSION_4_1_2
default "4.2.4" if GCC_VERSION_4_2_4
default "4.3.3+cs" if GCC_VERSION_4_3_3_CS default "4.3.3+cs" if GCC_VERSION_4_3_3_CS
default "4.3.5" if GCC_VERSION_4_3_5 default "4.3.5" if GCC_VERSION_4_3_5
default "4.4.1+cs" if GCC_VERSION_4_4_1_CS default "4.4.1+cs" if GCC_VERSION_4_4_1_CS
@ -13,19 +11,13 @@ config GCC_VERSION
config GCC_VERSION_4 config GCC_VERSION_4
bool bool
default y if GCC_VERSION_4_1
default y if GCC_VERSION_4_2 default y if GCC_VERSION_4_2
default y if GCC_VERSION_4_3 default y if GCC_VERSION_4_3
default y if GCC_VERSION_4_4 default y if GCC_VERSION_4_4
default y if GCC_VERSION_4_5 default y if GCC_VERSION_4_5
config GCC_VERSION_4_1
bool
default y if GCC_VERSION_4_1_2
config GCC_VERSION_4_2 config GCC_VERSION_4_2
bool bool
default y if GCC_VERSION_4_2_4
default y if GCC_VERSION_LLVM default y if GCC_VERSION_LLVM
config GCC_VERSION_4_3 config GCC_VERSION_4_3