summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-08-15 10:14:43 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-08-15 10:14:43 (GMT)
commite58af8f79ed50126d4e148b1ef509ef6068e2b38 (patch)
treef1dd2a46b25f248c95c44fda4dd25dce0981c7cb /config
parent6c368af5b4e68c05c8774ea5795b708aca9d0d66 (diff)
Get rid of the core cc selection. It is now the same as the final compiler.
Diffstat (limited to 'config')
-rw-r--r--config/cc.in45
-rw-r--r--config/cc_core_gcc.in166
-rw-r--r--config/cc_gcc.in14
3 files changed, 18 insertions, 207 deletions
diff --git a/config/cc.in b/config/cc.in
index 27d9d69..176cdf6 100644
--- a/config/cc.in
+++ b/config/cc.in
@@ -2,47 +2,9 @@
menu "C compiler"
-comment "Core C Compiler (used to build the C library)"
-
-config CC_USE_CORE
- bool
- prompt "Use a different core C compiler"
- default n
- help
- Use a different compiler to build the C library than the one
- in the final toolchain.
-
- You can change the compiler used, or only the version used.
-
- You most probably don't need that.
-
-choice
- bool
- prompt "Core C compiler:"
- depends on CC_USE_CORE
-
-config CC_CORE_GCC
- bool
- prompt "gcc"
-
-endchoice
-
-config CC_CORE_VERSION
- string
-
-config CC_CORE
- string
- default "gcc" if CC_CORE_GCC
-
-if CC_CORE_GCC && CC_USE_CORE
-source config/cc_core_gcc.in
-endif
-
-comment "Final C compiler"
-
choice
bool
- prompt "Final C compiler"
+ prompt "C compiler flavour"
default CC_GCC
config CC_GCC
@@ -54,6 +16,11 @@ config CC_GCC
select CC_SUPPORT_ADA
select CC_SUPPORT_OBJC
select CC_SUPPORT_OBJCXX
+ help
+ gcc is the full-blown GNU compiler. This is what most people will choose.
+
+ gcc sports lots of languages, powerfull code parser, optimised binary output,
+ and lots of other features.
endchoice
diff --git a/config/cc_core_gcc.in b/config/cc_core_gcc.in
deleted file mode 100644
index 5b5efd7..0000000
--- a/config/cc_core_gcc.in
+++ /dev/null
@@ -1,166 +0,0 @@
-# Compiler options
-
-choice
- bool
- prompt "Core gcc version"
-
-config CC_CORE_V_2_95_3
- bool
- prompt "2.95.3"
- depends on OBSOLETE
-
-config CC_CORE_V_3_2_3
- bool
- prompt "3.2.3"
- depends on OBSOLETE
-
-config CC_CORE_V_3_3
- bool
- prompt "3.3"
- depends on OBSOLETE
-
-config CC_CORE_V_3_3_1
- bool
- prompt "3.3.1"
- depends on OBSOLETE
-
-config CC_CORE_V_3_3_2
- bool
- prompt "3.3.2"
- depends on OBSOLETE
-
-config CC_CORE_V_3_3_3
- bool
- prompt "3.3.3"
- depends on OBSOLETE
-
-config CC_CORE_V_3_3_4
- bool
- prompt "3.3.4"
- depends on OBSOLETE
-
-config CC_CORE_V_3_3_5
- bool
- prompt "3.3.5"
- depends on OBSOLETE
-
-config CC_CORE_V_3_3_6
- bool
- prompt "3.3.6"
-
-config CC_CORE_V_3_4_0
- bool
- prompt "3.4.0"
- depends on OBSOLETE
-
-config CC_CORE_V_3_4_1
- bool
- prompt "3.4.1"
- depends on OBSOLETE
-
-config CC_CORE_V_3_4_2
- bool
- prompt "3.4.2"
- depends on OBSOLETE
-
-config CC_CORE_V_3_4_3
- bool
- prompt "3.4.3"
- depends on OBSOLETE
-
-config CC_CORE_V_3_4_4
- bool
- prompt "3.4.4"
- depends on OBSOLETE
-
-config CC_CORE_V_3_4_5
- bool
- prompt "3.4.5"
- depends on OBSOLETE
-
-config CC_CORE_V_3_4_6
- bool
- prompt "3.4.6"
-
-config CC_CORE_V_4_0_0
- bool
- prompt "4.0.0"
-
-config CC_CORE_V_4_0_1
- bool
- prompt "4.0.1"
-
-config CC_CORE_V_4_0_2
- bool
- prompt "4.0.2"
-
-config CC_CORE_V_4_0_3
- bool
- prompt "4.0.3"
-
-config CC_CORE_V_4_0_4
- bool
- prompt "4.0.4"
-
-config CC_CORE_V_4_1_0
- bool
- prompt "4.1.0"
-
-config CC_CORE_V_4_1_1
- bool
- prompt "4.1.1"
-
-config CC_CORE_V_4_1_2
- bool
- prompt "4.1.2"
-
-config CC_CORE_V_4_2_0
- bool
- prompt "4.2.0"
-
-config CC_CORE_V_4_2_1
- bool
- prompt "4.2.1"
-
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
-endchoice
-
-config CC_CORE_VERSION
- string
- default "2.95.3" if CC_CORE_V_2_95_3
- default "3.2.3" if CC_CORE_V_3_2_3
- default "3.3" if CC_CORE_V_3_3
- default "3.3.1" if CC_CORE_V_3_3_1
- default "3.3.2" if CC_CORE_V_3_3_2
- default "3.3.3" if CC_CORE_V_3_3_3
- default "3.3.4" if CC_CORE_V_3_3_4
- default "3.3.5" if CC_CORE_V_3_3_5
- default "3.3.6" if CC_CORE_V_3_3_6
- default "3.4.0" if CC_CORE_V_3_4_0
- default "3.4.1" if CC_CORE_V_3_4_1
- default "3.4.2" if CC_CORE_V_3_4_2
- default "3.4.3" if CC_CORE_V_3_4_3
- default "3.4.4" if CC_CORE_V_3_4_4
- default "3.4.5" if CC_CORE_V_3_4_5
- default "3.4.6" if CC_CORE_V_3_4_6
- default "4.0.0" if CC_CORE_V_4_0_0
- default "4.0.1" if CC_CORE_V_4_0_1
- default "4.0.2" if CC_CORE_V_4_0_2
- default "4.0.3" if CC_CORE_V_4_0_3
- default "4.0.4" if CC_CORE_V_4_0_4
- default "4.1.0" if CC_CORE_V_4_1_0
- default "4.1.1" if CC_CORE_V_4_1_1
- default "4.1.2" if CC_CORE_V_4_1_2
- default "4.2.0" if CC_CORE_V_4_2_0
- default "4.2.1" if CC_CORE_V_4_2_1
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
-
-config CC_CORE_EXTRA_CONFIG
- string
- prompt "Core gcc extra config"
- default ""
- depends on CC_USE_CORE && CC_CORE_GCC || ! CC_USE_CORE && CC_GCC
- help
- Extra flags to pass onto ./configure when configuring the core gcc.
diff --git a/config/cc_gcc.in b/config/cc_gcc.in
index 37e7467..51d1240 100644
--- a/config/cc_gcc.in
+++ b/config/cc_gcc.in
@@ -2,7 +2,7 @@
choice
bool
- prompt "Final gcc version"
+ prompt "gcc version"
config CC_V_2_95_3
bool
@@ -95,9 +95,19 @@ config CC_CXA_ATEXIT
If you get the missing symbol "__cxa_atexit" when building c++ programs,
you might want to try disabling this option.
+config CC_CORE_EXTRA_CONFIG
+ string
+ prompt "Core gcc extra config"
+ default ""
+ help
+ Extra flags to pass onto ./configure when configuring the core gcc.
+
+ The core gcc is a stripped down, C-only compiler needed to build
+ the C library. Kinda bootstrap gcc, if you wish.
+
config CC_EXTRA_CONFIG
string
- prompt "Final gcc extra config"
+ prompt "gcc extra config"
default ""
help
Extra flags to pass onto ./configure when configuring gcc.