mrrl

commit 9cb0ba9c06e90d4a2b7991b2a158e67a73a149ce
parent def4ed1e67b6b1470b0d37c77b02969cfdb428aa
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu, 18 Dec 2025 00:32:36 +0000

Remove binutils dependency, list executables explicitly

Diffstat:
M
templates/pkg/gcc
 | 
7
+++++--
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, 15 insertions(+), 8 deletions(-)
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -10,7 +10,6 @@
 #+{{pkg_install_name("gnu-make:bootstrap")}}
 #+{{pkg_install_name("busybox:bootstrap")}}
 #+{{pkg_install_name("nawk:bootstrap")}}
-#+{{pkg_install_name("binutils")}}
 #+{{pkg_install_name("musl")}}
 #+{{pkg_install_name("gmp")}}
 #+{{pkg_install_name("mpc")}}
@@ -219,7 +218,11 @@ find "$sysroot/lib" -mindepth 1 -maxdepth 1 -exec mv -v '{}' "$dest/lib/gcc/" \;
 {# Symlink binutils so gcc can use them without extra paths and naming.
  # Binutils aren't explicit dependency as we use previous toolchain's to build,
  # but this package is expected to use them further on -#}
-find "$binutils_cmd" -mindepth 1 -maxdepth 1 -exec ln -s -v '{}' "$dest/lib/gcc/{{triplet}}/" \;
+#find "$binutils_cmd" -mindepth 1 -maxdepth 1 -exec ln -s -v '{}' "$dest/lib/gcc/{{triplet}}/" \;
+for util in addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump ranlib readelf size strings strip; do
+	ln -s -v "$binutils_cmd/$util" "$dest/lib/gcc/{{triplet}}/" 
+done
+
 
 {%- endblock install %}
 {%- block check %}
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -4,7 +4,6 @@
 #+gnu-make.1a6f957896d36b7ec667811e294848be32b1ccef308d8273a913fd1a2e43297f
 #+busybox.873753ec059e869cde64a5146815d1500844431262134d94d420720ff9872079
 #+nawk.abe3790fd5e321ccd4e1ab7dab56339222e2eee686bc4b2241e7853104a4a500
-#+binutils.e27b3c2c7968d0c9ecd3f1be245f3ae14f44e4eeb82cd538cfc0f96f1afc4ef0
 #+musl.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6
 #+gmp.91d896a37889c6924e14bfa43cf254b905a41dabbe809c8e66fe86ea8a22bfee
 #+mpc.9c323c2e23836828197131d66b37fdecbfec8e6f2fcc8b14cfdfbcf4a3e82edf
@@ -199,7 +198,10 @@ printf >>link_to_lib '%s\n' 'ln -s "'$lib_to_top'${1#.}" ''library'/
 
 find "$sysroot/lib" -mindepth 1 -maxdepth 1 -exec mv -v '{}' "$dest/lib/gcc/" \;
 
-find "$binutils_cmd" -mindepth 1 -maxdepth 1 -exec ln -s -v '{}' "$dest/lib/gcc/x86_64-linux-musl/" \;
+#find "$binutils_cmd" -mindepth 1 -maxdepth 1 -exec ln -s -v '{}' "$dest/lib/gcc/x86_64-linux-musl/" \;
+for util in addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump ranlib readelf size strings strip; do
+	ln -s -v "$binutils_cmd/$util" "$dest/lib/gcc/x86_64-linux-musl/" 
+done
 
 
 # Validate the C compiler
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.ab3439f0d135622f4b857997ecbda84ac545422db148012987cca66241aaf7f6
-#+gcc.93d9f77ad570d738fcb9d4df3acd2af5a37e26b5a254d02fec887c542cb94e87
+#+gcc.21c6ef8950f2d4f737d08b982419f305c694d90c28c5901b7c9b49cc79a5b1d5
 #+binutils.e27b3c2c7968d0c9ecd3f1be245f3ae14f44e4eeb82cd538cfc0f96f1afc4ef0 
\ No newline at end of file
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -4,7 +4,6 @@
 #+gnu-make.6e725cf6b697f11e815df7887aa30333aa2b814c33766f15d15b346a2517bb5e
 #+busybox.1734a92160528b69651485f9a4f5e2317166e184c1033dd56a3a8464d959565f
 #+nawk.596c1948e96cbcabfe3954a70deb947de0c73be1ddde41fafe8291bfec04bdd4
-#+binutils.06634a7c6783445d52e5e45894b0c379f5be4df44124169e50096929bef7b5ee
 #+musl.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664
 #+gmp.ceea1f97ebaebfa0ac9bc0c2d4188fcfa5952f867edad779843da7bb6b495c90
 #+mpc.7cf67a2fe6cf12db441535a15c4e5927fc9f4f6f1998eb737ffd67b7f4203afa
@@ -199,7 +198,10 @@ printf >>link_to_lib '%s\n' 'ln -s "'$lib_to_top'${1#.}" ''library'/
 
 find "$sysroot/lib" -mindepth 1 -maxdepth 1 -exec mv -v '{}' "$dest/lib/gcc/" \;
 
-find "$binutils_cmd" -mindepth 1 -maxdepth 1 -exec ln -s -v '{}' "$dest/lib/gcc/x86_64-linux-musl/" \;
+#find "$binutils_cmd" -mindepth 1 -maxdepth 1 -exec ln -s -v '{}' "$dest/lib/gcc/x86_64-linux-musl/" \;
+for util in addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump ranlib readelf size strings strip; do
+	ln -s -v "$binutils_cmd/$util" "$dest/lib/gcc/x86_64-linux-musl/" 
+done
 
 
 # Validate the C compiler
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.1358b81a27c11cc51948ea8c8732f646d6f02ed63f255e63e3633fe9ae023664
-#+gcc.0a8f6e6168b5e40be56f64eba470469bf6b071e917391c239fe3bc41428fccd3
+#+gcc.4d1543f3781d1d3894a3d25b13235b827580006b823e11b48c6258822e684080
 #+binutils.06634a7c6783445d52e5e45894b0c379f5be4df44124169e50096929bef7b5ee 
\ No newline at end of file