mrrl

commit 00eed6451a5988b6d13a27e668747e6e353313f4
parent a106059daa13f52f1371131fdad1569da9ad5f78
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri,  5 Dec 2025 05:05:01 +0000

gcc

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

5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -41,9 +41,12 @@ find "$pthbs_build_environment/{{libdir}}" "$pthbs_build_environment/{{dynlibdir
 		(*)
 			ldir=${lnk#${pthbs_build_environment}/}
 			ldir=${ldir#*/}
-			ldir=$sysroot/lib/${ldir%/*}
+			case $ldir in
+				(*/*) ldir=$sysroot/lib/${ldir%/*} ;;
+				(*) ldir=. ;;
+			esac
 			mkdir -p "$ldir"
-			ln -s "$lnk" "$ldir"
+			cp -a "$lnk" "$ldir/"
 			;;
 	esac
 done
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -63,9 +63,12 @@ find "$pthbs_build_environment/library" "$pthbs_build_environment/library.so" -t
 		(*)
 			ldir=${lnk#${pthbs_build_environment}/}
 			ldir=${ldir#*/}
-			ldir=$sysroot/lib/${ldir%/*}
+			case $ldir in
+				(*/*) ldir=$sysroot/lib/${ldir%/*} ;;
+				(*) ldir=. ;;
+			esac
 			mkdir -p "$ldir"
-			ln -s "$lnk" "$ldir"
+			cp -a "$lnk" "$ldir/"
 			;;
 	esac
 done
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.d40145e42df8fcac864462ec7c0d6d98b955bd8ec1e32c366f6d1caaad059f29
-#+gcc.49cfb9cfd2f0d259ca4c55074239d441de86648075ce929395c7101e5bab41fa
+#+gcc.85b277f096352db727e3a4af0b7a6e76d427af10bab64497d78760e1b7bd049a
 #+binutils.61110e9df9b0525505b7e8cc6711aa204a77ec354ddd77e8db62818a45806da7 
\ No newline at end of file
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -63,9 +63,12 @@ find "$pthbs_build_environment/library" "$pthbs_build_environment/library.so" -t
 		(*)
 			ldir=${lnk#${pthbs_build_environment}/}
 			ldir=${ldir#*/}
-			ldir=$sysroot/lib/${ldir%/*}
+			case $ldir in
+				(*/*) ldir=$sysroot/lib/${ldir%/*} ;;
+				(*) ldir=. ;;
+			esac
 			mkdir -p "$ldir"
-			ln -s "$lnk" "$ldir"
+			cp -a "$lnk" "$ldir/"
 			;;
 	esac
 done
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.bb2e3009193337ab6f2bb8be1d693eda905f85870915a25997aadc8638d79630
-#+gcc.92351266ef4ee7ceb40beb779b5cd42be771ca1c26f177176b88c650b19d886a
+#+gcc.e09a6155729d0caddecfdffde3c75839700030c365570c3cd1dae6575b8c4e89
 #+binutils.4efbb6d2ad8a05268dc69b428b32e7099275d7380406658321c6b11222baf137 
\ No newline at end of file