mrrl

commit dc2cf234bb8a6256b44b03ef70591505a8d80738
parent 76907ca4a5b6b93ae59aa875bc52624f2e6f384c
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri,  5 Dec 2025 14:38:05 +0000

gcc

Diffstat:
M
templates/pkg/gcc
 | 
6
+++---
M
variants/ccx-x86_64/gcc
 | 
6
+++---
M
variants/ccx-x86_64/toolchain.environment
 | 
2
+-
M
variants/root-x86_64/gcc
 | 
6
+++---
M
variants/root-x86_64/toolchain.environment
 | 
2
+-

5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -27,7 +27,7 @@ build_env_static
 
 sysroot="$(realpath ..)/sysroot"
 objdir="$(realpath ..)/objdir"
-objdir="$(realpath ..)/install"
+installdir="$(realpath ..)/install"
 src="$(realpath .)"
 
 sed -i.orig -e 's|/lib/ld-musl-|{{versions}}/'"$musl"'/{{dynlibdir}}/ld-musl-|' ./gcc/config/*/linux*.h
@@ -148,11 +148,11 @@ make \
 	'ac_cv_prog_lex_root=lex.yy' \
 	'MAKEINFO=false' \
 	'MAKE=make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false ' \
-	"DESTDIR=$install" \
+	"DESTDIR=$installdir" \
 	install
 
 mkdir -p "${dest%/*}"
-mv "${install}${prefix}" "${dest%/*}/"
+mv "${installdir}${prefix}" "${dest%/*}/"
 
 {%- endblock install %}
 {%- block check %}
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -49,7 +49,7 @@ build_env_static
 
 sysroot="$(realpath ..)/sysroot"
 objdir="$(realpath ..)/objdir"
-objdir="$(realpath ..)/install"
+installdir="$(realpath ..)/install"
 src="$(realpath .)"
 
 sed -i.orig -e 's|/lib/ld-musl-|/home/ccx/versions/'"$musl"'/library.so/ld-musl-|' ./gcc/config/*/linux*.h
@@ -162,11 +162,11 @@ make \
 	'ac_cv_prog_lex_root=lex.yy' \
 	'MAKEINFO=false' \
 	'MAKE=make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false ' \
-	"DESTDIR=$install" \
+	"DESTDIR=$installdir" \
 	install
 
 mkdir -p "${dest%/*}"
-mv "${install}${prefix}" "${dest%/*}/"
+mv "${installdir}${prefix}" "${dest%/*}/"
 
 
 
diff --git a/variants/ccx-x86_64/toolchain.environment b/variants/ccx-x86_64/toolchain.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
 #+musl.482a19dddf233e35e7c751e630fe2b722e816571308e4c853547f66279c695d1
-#+gcc.180d74ae41898d8784bf1f8eaf6178a09df46f15760bdf8714a85950f1cb5329
+#+gcc.9a92af435d3cde557dafba72a0772cbb1ed683d6e9c7d1054e38b99f3cf07b79
 #+binutils.bf9e9a062ef806f17463844472a1b6caa7ab35ce9d28cc87d7b13174bea3cb62 
\ No newline at end of file
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -49,7 +49,7 @@ build_env_static
 
 sysroot="$(realpath ..)/sysroot"
 objdir="$(realpath ..)/objdir"
-objdir="$(realpath ..)/install"
+installdir="$(realpath ..)/install"
 src="$(realpath .)"
 
 sed -i.orig -e 's|/lib/ld-musl-|/versions/'"$musl"'/library.so/ld-musl-|' ./gcc/config/*/linux*.h
@@ -162,11 +162,11 @@ make \
 	'ac_cv_prog_lex_root=lex.yy' \
 	'MAKEINFO=false' \
 	'MAKE=make MULTILIB_OSDIRNAMES= INFO_DEPS= infodir= ac_cv_prog_lex_root=lex.yy MAKEINFO=false ' \
-	"DESTDIR=$install" \
+	"DESTDIR=$installdir" \
 	install
 
 mkdir -p "${dest%/*}"
-mv "${install}${prefix}" "${dest%/*}/"
+mv "${installdir}${prefix}" "${dest%/*}/"
 
 
 
diff --git a/variants/root-x86_64/toolchain.environment b/variants/root-x86_64/toolchain.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
 #+musl.f839d12670987d4df0060ddb3a81e9403da255fc1ecc9538bc64b9b76588b966
-#+gcc.e87036bb62cc99db367890b844c939c57f6dca6a25e115e37926e74bbe5f32bf
+#+gcc.15dba56f87cc1a9df76fc6170b9ee595c3ae696f77b122e9994b5707b141f389
 #+binutils.8b804d5888333289279c7d5d20672b7aad6f1b1a3cd7efa8d65ce623a6139687 
\ No newline at end of file