summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-04-13 13:29:22 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-04-26 22:39:34 +0200
commit4612aeec57ee5356a535727cf578e072649447ba (patch)
tree86b80174da3ae7906da2592efed578adf5b93b43
parent4cf6ec229fe2876f058779f56ae735fe55125a03 (diff)
toolchain: reorganize target gcc options
* Move target gcc language selections to the package menu. * Disable objc & fortran options unless target gcc is selected. * Rename the "native toolchain" option to gcc. * Disable target gcc unless we're using a buildroot toolchain. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--toolchain/gcc/Config.in12
-rw-r--r--toolchain/gcc/Config.in.220
2 files changed, 16 insertions, 16 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index cf3687815..7fce640c2 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -62,18 +62,6 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS
help
Any additional gcc configure options you may want to include....
-config BR2_GCC_CROSS_OBJC
- bool "Objective-C cross-compiler support"
- depends on !BR2_avr32
- help
- Build an Objective-C cross-compiler
-
-config BR2_GCC_CROSS_FORTRAN
- bool "Fortran cross-compiler support"
- depends on !BR2_avr32
- help
- Build a Fortran cross-compiler
-
config BR2_GCC_CROSS_JAVA
bool
diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index 705506b68..886e99b2b 100644
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GCC_TARGET
- bool "native toolchain in the target filesystem"
- depends on BR2_HAVE_DEVFILES
+ bool "gcc"
+ depends on BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT
select BR2_PACKAGE_BINUTILS
select BR2_PACKAGE_BINUTILS_TARGET
select BR2_PACKAGE_MPC if BR2_GCC_VERSION_4_5_X
@@ -10,6 +10,18 @@ config BR2_PACKAGE_GCC_TARGET
If you want the target system to be able to run
binutils/gcc and compile native code, say Y here.
+config BR2_GCC_CROSS_FORTRAN
+ bool "fortran support"
+ depends on !BR2_avr32 && BR2_PACKAGE_GCC_TARGET
+ help
+ Build a Fortran compiler
+
+config BR2_GCC_CROSS_OBJC
+ bool "objective-c support"
+ depends on !BR2_avr32 && BR2_PACKAGE_GCC_TARGET
+ help
+ Build an Objective-C compiler
+
config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
string "Additional target gcc options"
default ""
@@ -19,5 +31,5 @@ config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
Including, but not limited to --disable-checking etc.
Refer to */configure in your gcc sources.
-comment "native toolchain needs development files in target filesystem"
- depends on !BR2_HAVE_DEVFILES
+comment "gcc needs development files in target filesystem"
+ depends on !BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT