mrrl

commit 026366f9f5f722216c7e7d3f324e0e2c98e555c6
parent 4ada9ab6887f3f7deccf6ed05d7d2c76687207d6
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri,  5 Dec 2025 05:39:04 +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
@@ -34,16 +34,16 @@ for orig in ./gcc/config/*/linux*.h.orig; do
 	rm "$orig"
 done
 
+env_lib_prefix=${pthbs_build_environment}/{{libdir}}
 mkdir -p "$sysroot/lib"
 find "$pthbs_build_environment/{{libdir}}" "$pthbs_build_environment/{{dynlibdir}}" -type l -print | while IFS= read -r lnk; do
 	case $(realpath $lnk) in
 		($mcm/*) ;;
 		(*)
-			ldir=${lnk#${pthbs_build_environment}/}
-			ldir=${ldir#*/}
+			ldir=${lnk#${env_lib_prefix}/}
 			case $ldir in
 				(*/*) ldir=$sysroot/lib/${ldir%/*} ;;
-				(*) ldir=. ;;
+				(*) ldir=$sysroot/lib ;;
 			esac
 			mkdir -p "$ldir"
 			cp -a "$lnk" "$ldir/"
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -56,16 +56,16 @@ for orig in ./gcc/config/*/linux*.h.orig; do
 	rm "$orig"
 done
 
+env_lib_prefix=${pthbs_build_environment}/library
 mkdir -p "$sysroot/lib"
 find "$pthbs_build_environment/library" "$pthbs_build_environment/library.so" -type l -print | while IFS= read -r lnk; do
 	case $(realpath $lnk) in
 		($mcm/*) ;;
 		(*)
-			ldir=${lnk#${pthbs_build_environment}/}
-			ldir=${ldir#*/}
+			ldir=${lnk#${env_lib_prefix}/}
 			case $ldir in
 				(*/*) ldir=$sysroot/lib/${ldir%/*} ;;
-				(*) ldir=. ;;
+				(*) ldir=$sysroot/lib ;;
 			esac
 			mkdir -p "$ldir"
 			cp -a "$lnk" "$ldir/"
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.6d0ee8016d4e5fb7271693818fa02f73a6c9c13e210da7ac6bbf610bc0d534bb
-#+gcc.c14f02e421f886b0070d2cb2a43d9fa5b097e62fb53a8cd3a75cc356d72b4fe2
+#+gcc.8bf898cb21e34b8afbd4ed6b1acc38d06d0a7533f0abedaf76d77afa0a1e2c35
 #+binutils.d68de53a3e10da711ed0fada63dc79a630b24e642ad1fca2fb6593485379bcea 
\ No newline at end of file
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -56,16 +56,16 @@ for orig in ./gcc/config/*/linux*.h.orig; do
 	rm "$orig"
 done
 
+env_lib_prefix=${pthbs_build_environment}/library
 mkdir -p "$sysroot/lib"
 find "$pthbs_build_environment/library" "$pthbs_build_environment/library.so" -type l -print | while IFS= read -r lnk; do
 	case $(realpath $lnk) in
 		($mcm/*) ;;
 		(*)
-			ldir=${lnk#${pthbs_build_environment}/}
-			ldir=${ldir#*/}
+			ldir=${lnk#${env_lib_prefix}/}
 			case $ldir in
 				(*/*) ldir=$sysroot/lib/${ldir%/*} ;;
-				(*) ldir=. ;;
+				(*) ldir=$sysroot/lib ;;
 			esac
 			mkdir -p "$ldir"
 			cp -a "$lnk" "$ldir/"
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.3d57f06371533319a58f7bc04c9da19bf458c2de9eebc86d0f487f168ada3a2a
-#+gcc.4900ae0f34beccb908f2c891a54a465fae88946c5e57b6bc6f1c4f9e2066d860
+#+gcc.c1ad5bb9d2e716cf8595767c293b1e79f9f2934e8bd65a871a6bf211a75b5955
 #+binutils.08f16e1fb96251cec8198ebdc69423c2f4217686c1bbc3da47b6b30fbecc32e8 
\ No newline at end of file