simplify configuration

SVN-Revision: 27353
master
Imre Kaloz 13 years ago
parent 7845c7b512
commit a2c0394572
  1. 2
      toolchain/gcc/Config.in
  2. 15
      toolchain/gcc/common.mk

@ -25,7 +25,7 @@ endchoice
config GCC_USE_GRAPHITE config GCC_USE_GRAPHITE
bool bool
prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
depends GCC_VERSION_4_4 || GCC_VERSION_4_5 || GCC_VERSION_4_6 depends !GCC_VERSION_LLVM
config GCC_USE_SYSTEM_PPL_CLOOG config GCC_USE_SYSTEM_PPL_CLOOG
bool bool

@ -104,27 +104,20 @@ GCC_CONFIGURE:= \
$(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 --with-abi=64) \ $(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 --with-abi=64) \
$(if $(CONFIG_GCC_VERSION_LLVM),--enable-llvm=$(BUILD_DIR_BASE)/host/llvm) \ $(if $(CONFIG_GCC_VERSION_LLVM),--enable-llvm=$(BUILD_DIR_BASE)/host/llvm) \
ifneq ($(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6),)
ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
GCC_CONFIGURE += --with-mips-plt
endif
endif
ifeq ($(CONFIG_GCC_LLVM),) ifeq ($(CONFIG_GCC_LLVM),)
GCC_BUILD_TARGET_LIBGCC:=y GCC_BUILD_TARGET_LIBGCC:=y
GCC_CONFIGURE+= \ GCC_CONFIGURE+= \
--with-gmp=$(TOPDIR)/staging_dir/host \ --with-gmp=$(TOPDIR)/staging_dir/host \
--with-mpfr=$(TOPDIR)/staging_dir/host \ --with-mpfr=$(TOPDIR)/staging_dir/host \
--disable-decimal-float --disable-decimal-float
ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
GCC_CONFIGURE += --with-mips-plt
endif
endif endif
ifneq ($(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6),) ifneq ($(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6),)
GCC_BUILD_TARGET_LIBGCC:=y
GCC_CONFIGURE+= \ GCC_CONFIGURE+= \
--with-gmp=$(TOPDIR)/staging_dir/host \ --with-mpc=$(TOPDIR)/staging_dir/host
--with-mpc=$(TOPDIR)/staging_dir/host \
--with-mpfr=$(TOPDIR)/staging_dir/host \
--disable-decimal-float
endif endif
ifneq ($(CONFIG_SSP_SUPPORT),) ifneq ($(CONFIG_SSP_SUPPORT),)

Loading…
Cancel
Save