mrrl

commit 5b9bec8d32b08a34e86553ceb2b6ce8d7ad2ad61
parent e769e4744d129638627ce35df75b42e1b1cbc450
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri,  5 Dec 2025 08:59:19 +0000

gcc

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

5 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -47,13 +47,16 @@ find "$pthbs_build_environment/{{libdir}}" "$pthbs_build_environment/{{dynlibdir
 				(${env_lib}|${env_dynlib})
 					ldir=$sysroot/lib ;;
 				(${env_lib}/*)
-					ldir=$sysroot/lib/${ldir#${env_lib}/} ;;
+					ldir=$sysroot/lib/${ldir#${env_lib}/}
+					mkdir -p "$ldir"
+					;;
 				(${env_dynlib}/*)
-					ldir=$sysroot/lib/${ldir#${env_dynlib}/} ;;
+					mkdir -p "$ldir"
+					ldir=$sysroot/lib/${ldir#${env_dynlib}/}
+					;;
 				(*) printf 'WARNING: unexpected file: %s\n' "$lnk"
 					continue ;;
 			esac
-			mkdir -p "$ldir"
 			cp -a "$lnk" "$ldir/"
 			;;
 	esac
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -69,13 +69,16 @@ find "$pthbs_build_environment/library" "$pthbs_build_environment/library.so" -t
 				(${env_lib}|${env_dynlib})
 					ldir=$sysroot/lib ;;
 				(${env_lib}/*)
-					ldir=$sysroot/lib/${ldir#${env_lib}/} ;;
+					ldir=$sysroot/lib/${ldir#${env_lib}/}
+					mkdir -p "$ldir"
+					;;
 				(${env_dynlib}/*)
-					ldir=$sysroot/lib/${ldir#${env_dynlib}/} ;;
+					mkdir -p "$ldir"
+					ldir=$sysroot/lib/${ldir#${env_dynlib}/}
+					;;
 				(*) printf 'WARNING: unexpected file: %s\n' "$lnk"
 					continue ;;
 			esac
-			mkdir -p "$ldir"
 			cp -a "$lnk" "$ldir/"
 			;;
 	esac
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.d4132e82b5fcbdea22e1dd41711b064bbce38102a69c116da7044f07cb75d5e5
+#+gcc.e8c21d59fa5e500edcd32c2335c0496e87eabc31b9f4b92332bdaf0f027d3b87
 #+binutils.bf9e9a062ef806f17463844472a1b6caa7ab35ce9d28cc87d7b13174bea3cb62 
\ No newline at end of file
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -69,13 +69,16 @@ find "$pthbs_build_environment/library" "$pthbs_build_environment/library.so" -t
 				(${env_lib}|${env_dynlib})
 					ldir=$sysroot/lib ;;
 				(${env_lib}/*)
-					ldir=$sysroot/lib/${ldir#${env_lib}/} ;;
+					ldir=$sysroot/lib/${ldir#${env_lib}/}
+					mkdir -p "$ldir"
+					;;
 				(${env_dynlib}/*)
-					ldir=$sysroot/lib/${ldir#${env_dynlib}/} ;;
+					mkdir -p "$ldir"
+					ldir=$sysroot/lib/${ldir#${env_dynlib}/}
+					;;
 				(*) printf 'WARNING: unexpected file: %s\n' "$lnk"
 					continue ;;
 			esac
-			mkdir -p "$ldir"
 			cp -a "$lnk" "$ldir/"
 			;;
 	esac
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.6faa1f52ed43486ec0707f4ba32d051404b4cb6502333350d8fb864d6b57a185
+#+gcc.0bde0d3e61028de640b67a383857de007e905007989c1e41951fe7afc1faca27
 #+binutils.8b804d5888333289279c7d5d20672b7aad6f1b1a3cd7efa8d65ce623a6139687 
\ No newline at end of file