summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorFlorian Franzmann2022-05-27 15:28:17 +0200
committerFlorian Franzmann2022-05-29 00:03:24 +0200
commit800f475eb90ce380acebf6c922369ed9614e126a (patch)
tree3c912222f5611ddc8e4e5ec380c951c76a88180d /gnu
parent7e410802a23cb347976e2b9d42d83cd348f5a4a0 (diff)
gnu/gcc: update Ada bootstrapper to 12.1.0
Diffstat (limited to 'gnu')
-rwxr-xr-xgnu/gcc/BUILD8
-rwxr-xr-xgnu/gcc/DETAILS2
-rw-r--r--gnu/gcc/HISTORY1
3 files changed, 6 insertions, 5 deletions
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index 370be73b57..fff1758a36 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -69,14 +69,14 @@ if list_find "$GCC_COMPILER" "ada" ; then
ADA_PATH=${SOURCE13/.tar.bz2/} &&
PATH=$SOURCE_DIRECTORY/$ADA_PATH/bin:$PATH &&
- export CC="$SOURCE_DIRECTORY/$ADA_PATH/bin/gcc" &&
+ export CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gcc" &&
- export INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/lib/gcc/$HOST/${VERSION13}/include" &&
- export LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/lib/gcc/$HOST/${VERSION13}/" &&
+ export INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gcc/$HOST/${VERSION13}/include" &&
+ export LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gcc/$HOST/${VERSION13}/" &&
export LDFLAGS="-L${LIB_DIR}" &&
export LIBRARY_PATH="$LIB_DIR" &&
export LD_LIBRARY_PATH="$LIB_DIR" &&
- export COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/bin" &&
+ export COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin" &&
export ADA_OBJECTS_PATH="$LIB_DIR/adalib" &&
export ADA_INCLUDE_PATH="$LIB_DIR/adainclude" &&
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 7365c3aa03..82bb12f252 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -35,7 +35,7 @@ if list_find "$GCC_COMPILER" "ada" ; then
#
case "${SMGL_COMPAT_ARCHS[1]}" in
- x86_64) VERSION13=11.1.0 ARCH13=x86_64 ;;
+ x86_64) VERSION13=12.1.0 ARCH13=x86_64 ;;
*) VERSION13=4.7.1 ARCH13=i686 ;;
esac
SOURCE13=ada-$VERSION13-$ARCH13-pc-linux-gnu.tar.bz2
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 7f87d34bd9..8adcbdad9d 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -2,6 +2,7 @@
* PREPARE, UP_TRIGGERS: fix message colors
* BUILD: set --enable-host-shared if jit has been selected
* DETAILS: switch isl SOURCE_URL to new upstream URL
+ * DETAILS, BUILD: update ada bootstrapper to 12.1.0
2022-05-06 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 12.1.0