summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorIsmael Luceno2016-06-28 22:57:47 +0200
committerIsmael Luceno2016-06-28 22:57:47 +0200
commit1ce2ae78355a31ea965220d3a8f52cd70373a5ce (patch)
treeb33bb9cd5d38395205072f0ac5b1ed5b69d6551b /gnu
parent53909e86a782efc8a7f554c5a2976d8d0366b602 (diff)
gcc: C and C++ are mandatory, fix query
Diffstat (limited to 'gnu')
-rwxr-xr-xgnu/gcc/BUILD2
-rwxr-xr-xgnu/gcc/PREPARE14
2 files changed, 5 insertions, 11 deletions
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index 4a74f8e8d5..20ccc334de 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -87,7 +87,7 @@ OPTS="--libexecdir=${INSTALL_ROOT}/usr/lib $OPTS" &&
OPTS="--mandir=${INSTALL_ROOT}/usr/share/man $OPTS" &&
OPTS="--infodir=${INSTALL_ROOT}/usr/share/info $OPTS" &&
OPTS="--with-bugurl=http://bugs.sourcemage.org $OPTS" &&
-OPTS="--enable-languages=$(echo ${GCC_COMPILER} | tr " " ","),lto $OPTS" &&
+OPTS="--enable-languages=${GCC_COMPILER// /,},c,c++,lto $OPTS" &&
OPTS="--enable-shared $OPTS" &&
OPTS="--enable-threads=posix $OPTS" &&
OPTS="--enable-__cxa_atexit $OPTS" &&
diff --git a/gnu/gcc/PREPARE b/gnu/gcc/PREPARE
index b41cb7bbf1..7efb177e0b 100755
--- a/gnu/gcc/PREPARE
+++ b/gnu/gcc/PREPARE
@@ -1,21 +1,15 @@
-message "The following special targets are available for compiler selection:"
-message "default - will build c and c++"
-message "all - will build all compilers"
+message "Note: C and C++ compilers are always built"
. $GRIMOIRE/config_query_multi.function
-config_query_multi GCC_COMPILER "Select the compilers you want to build" \
- default \
+config_query_multi GCC_COMPILER "Select the additional compilers you want" \
+ none \
ada \
- c \
- c++ \
fortran \
go \
java \
objc \
obj-c++ \
all &&
-list_remove GCC_COMPILER default &&
-list_add GCC_COMPILER c &&
-list_add GCC_COMPILER c++ &&
+list_remove GCC_COMPILER none &&
if list_find "$GCC_COMPILER" "all" ; then
list_remove GCC_COMPILER all &&
list_add GCC_COMPILER ada &&