diff options
| -rw-r--r-- | toolchain/gcc/Config.in | 5 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 2 | ||||
| -rw-r--r-- | tools/Makefile | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 6df2661737..b19427be0a 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -50,6 +50,11 @@ endif 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_1 || GCC_VERSION_4_4_2 + config EXTRA_GCC_CONFIG_OPTIONS string prompt "Additional gcc configure options" if TOOLCHAINOPTS diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 9d865e94d3..ea103c4539 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -90,7 +90,7 @@ GCC_CONFIGURE:= \ --disable-libmudflap \ --disable-multilib \ --disable-nls \ - $(if $(CONFIG_GCC_VERSION_4_4),--with-host-libstdcxx=-lstdc++) \ + $(if $(CONFIG_GCC_USE_GRAPHITE),--with-host-libstdcxx=-lstdc++) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ $(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 --with-abi=64) \ diff --git a/tools/Makefile b/tools/Makefile index 6e5eb24cd3..b7c7f43db6 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -20,7 +20,7 @@ tools-y += firmware-utils patch-cmdline quilt yaffs2 tools-$(CONFIG_CCACHE) += ccache tools-dep += lzma -ifdef CONFIG_GCC_VERSION_4_4 +ifdef CONFIG_GCC_USE_GRAPHITE tools-y += ppl cloog $(curdir)/cloog/compile := $(curdir)/ppl/install endif @@ -82,5 +82,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)) +$(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_3 CONFIG_GCC_USE_GRAPHITE)) $(eval $(call subdir,$(curdir))) |