summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorFlorian Franzmann2016-05-07 11:54:46 +0200
committerFlorian Franzmann2016-05-08 19:17:46 +0200
commit2a9aaf98103fea9d261d1fcee0b19790515e70bd (patch)
treee4889baade9829dc1a039af99d09991c72ffa5c2 /gnu
parent6a1632da671174c02bf02cab3c16e465e5c27100 (diff)
gnu/gcc: adapt to languages available in 6.1
Diffstat (limited to 'gnu')
-rw-r--r--gnu/gcc/HISTORY3
-rwxr-xr-xgnu/gcc/PREPARE21
2 files changed, 13 insertions, 11 deletions
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 8759ebe701..815a9aba92 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,6 @@
+2016-05-07 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * PREPARE: adapt to languages available in gcc 6.1
+
2016-04-27 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.1.0
* integer_parameter_restrictions.patch: deleted
diff --git a/gnu/gcc/PREPARE b/gnu/gcc/PREPARE
index 4fb22ea417..7a0bc5ac58 100755
--- a/gnu/gcc/PREPARE
+++ b/gnu/gcc/PREPARE
@@ -11,17 +11,16 @@ config_query_multi GCC_COMPILER "Select the compilers you want to build" \
go \
java \
objc \
+ obj-c++ \
all &&
-
-list_add GCC_COMPILER c
+list_remove GCC_COMPILER default &&
+list_add GCC_COMPILER c &&
+list_add GCC_COMPILER c++ &&
if list_find "$GCC_COMPILER" "all" ; then
- GCC_COMPILER="c c++ ada java fortran objc"
-elif list_find "$GCC_COMPILER" "default" ; then
- list_add GCC_COMPILER c++
- list_remove GCC_COMPILER default
-elif list_find "$GCC_COMPILER" "java" ; then
- if ! list_find "$GCC_COMPILER" "c++" ; then
- list_add GCC_COMPILER c++
- fi
+ list_remove GCC_COMPILER all &&
+ list_add GCC_COMPILER ada &&
+ list_add GCC_COMPILER fortran &&
+ list_add GCC_COMPILER go &&
+ list_add GCC_COMPILER objc &&
+ list_add GCC_COMPILER obj-c++
fi
-