summaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-02 07:50:26 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-02 07:50:26 +0000
commit23867be681558f22706880a6444c9bcf8096e434 (patch)
tree8b614b366c9a58b5ef8ec985bc5e9a7391552b04 /toolchain
parentf1f039671842b147f2a7bb55642e4541f4c714ea (diff)
[toolchain/gcc]: simplify configuration
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27353 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/Config.in2
-rw-r--r--toolchain/gcc/common.mk15
2 files changed, 5 insertions, 12 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 556a56955..75d388dc6 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -25,7 +25,7 @@ endchoice
config GCC_USE_GRAPHITE
bool
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
bool
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 2762f6ad0..d2177c546 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -104,27 +104,20 @@ GCC_CONFIGURE:= \
$(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 --with-abi=64) \
$(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),)
GCC_BUILD_TARGET_LIBGCC:=y
GCC_CONFIGURE+= \
--with-gmp=$(TOPDIR)/staging_dir/host \
--with-mpfr=$(TOPDIR)/staging_dir/host \
--disable-decimal-float
+ ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
+ GCC_CONFIGURE += --with-mips-plt
+ endif
endif
ifneq ($(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6),)
- GCC_BUILD_TARGET_LIBGCC:=y
GCC_CONFIGURE+= \
- --with-gmp=$(TOPDIR)/staging_dir/host \
- --with-mpc=$(TOPDIR)/staging_dir/host \
- --with-mpfr=$(TOPDIR)/staging_dir/host \
- --disable-decimal-float
+ --with-mpc=$(TOPDIR)/staging_dir/host
endif
ifneq ($(CONFIG_SSP_SUPPORT),)