mrrl

commit 31a7657964a526b6d96e4614b2e9de38e8c41d2c
parent c758432bae1704433caaa499dc2412585cd0713e
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri,  5 Dec 2025 08:44:25 +0000

gcc

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

5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -43,9 +43,7 @@ find "$pthbs_build_environment/{{libdir}}" "$pthbs_build_environment/{{dynlibdir
 		(*)
 			ldir=${lnk%/*}
 			case $ldir in
-				(${env_lib})
-					ldir=$sysroot/lib ;;
-				((${env_dynlib})
+				(${env_lib}|${env_dynlib})
 					ldir=$sysroot/lib ;;
 				(${env_lib}/*)
 					ldir=$sysroot/lib/${ldir#${env_lib}/} ;;
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -65,9 +65,7 @@ find "$pthbs_build_environment/library" "$pthbs_build_environment/library.so" -t
 		(*)
 			ldir=${lnk%/*}
 			case $ldir in
-				(${env_lib})
-					ldir=$sysroot/lib ;;
-				((${env_dynlib})
+				(${env_lib}|${env_dynlib})
 					ldir=$sysroot/lib ;;
 				(${env_lib}/*)
 					ldir=$sysroot/lib/${ldir#${env_lib}/} ;;
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.d7acb43f37250e1ef1653a13c7e68d6c1c6dbfce4831d016b781bb750b28e7df
+#+gcc.e678e8c5878a5a83abd8dd3731b158f40dbaab4d8eee14e982f0a5b6a7293ee4
 #+binutils.bf9e9a062ef806f17463844472a1b6caa7ab35ce9d28cc87d7b13174bea3cb62 
\ No newline at end of file
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -65,9 +65,7 @@ find "$pthbs_build_environment/library" "$pthbs_build_environment/library.so" -t
 		(*)
 			ldir=${lnk%/*}
 			case $ldir in
-				(${env_lib})
-					ldir=$sysroot/lib ;;
-				((${env_dynlib})
+				(${env_lib}|${env_dynlib})
 					ldir=$sysroot/lib ;;
 				(${env_lib}/*)
 					ldir=$sysroot/lib/${ldir#${env_lib}/} ;;
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.986a1f4cc4b67cffd9ff2d362095372dfb8eb6904f40f53aeb77eb8da9b3463c
+#+gcc.78e9f865911d4c5d7777b18b533881f3343abefe536f2c2a5c2b31ef19597f7a
 #+binutils.8b804d5888333289279c7d5d20672b7aad6f1b1a3cd7efa8d65ce623a6139687 
\ No newline at end of file