mrrl

commit c8cf63620b7e51e8fd1f2eb0c35a49df8bf34332
parent 1e1a6235863fb40f4edc870188d997dad10cce1d
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed, 17 Dec 2025 22:26:10 +0000

build gcc with debug info

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, 8 insertions(+), 8 deletions(-)
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -48,7 +48,7 @@ with_make_vars_inner() {
 
 with_make_vars() {
 	with_make_vars_inner "$@" \
-	MAKE="make $(make_with_vars_inner printf '\t%s"' | sed -Ee 's/\t([^"]+=)/ \1"/g') "
+	MAKE="make $(with_make_vars_inner printf '\t%s"' | sed -Ee 's/\t([^"=]+=)/ \1"/g') "
 }
 
 sed -i.orig -e "s|/lib/ld-musl-|$musl/"{{dynlibdir|shesc}}"/ld-musl-|" ./gcc/config/*/linux*.h
@@ -137,7 +137,7 @@ repro="$repro -ffile-prefix-map=${src}=builddir"
 	--with-build-time-tools="$pthbs_build_environment/{{bindir}}" \
 	--with-sysroot=/ \
 	FFLAGS="$fl" \
-	LDFLAGS="-s --static $LDFLAGS" \
+	LDFLAGS="--static $LDFLAGS" \
 	AR_FOR_TARGET="$mcm_bin"-ar \
 	AS_FOR_TARGET="$mcm_bin"-as \
 	LD_FOR_TARGET="$mcm_bin"-ld \
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -69,7 +69,7 @@ with_make_vars_inner() {
 
 with_make_vars() {
 	with_make_vars_inner "$@" \
-	MAKE="make $(make_with_vars_inner printf '\t%s"' | sed -Ee 's/\t([^"]+=)/ \1"/g') "
+	MAKE="make $(with_make_vars_inner printf '\t%s"' | sed -Ee 's/\t([^"=]+=)/ \1"/g') "
 }
 
 sed -i.orig -e "s|/lib/ld-musl-|$musl/"'library.so'"/ld-musl-|" ./gcc/config/*/linux*.h
@@ -150,7 +150,7 @@ repro="$repro -ffile-prefix-map=${src}=builddir"
 	--with-build-time-tools="$pthbs_build_environment/command" \
 	--with-sysroot=/ \
 	FFLAGS="$fl" \
-	LDFLAGS="-s --static $LDFLAGS" \
+	LDFLAGS="--static $LDFLAGS" \
 	AR_FOR_TARGET="$mcm_bin"-ar \
 	AS_FOR_TARGET="$mcm_bin"-as \
 	LD_FOR_TARGET="$mcm_bin"-ld \
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.3509e997587c11845daf5ff0477b7b79be35a94a7b3f7c7f3a498b9762e31cfb
+#+gcc.1949499b31b9690caeb625ad4a0b336028a2812d5b60ef1221856be04423363d
 #+binutils.e27b3c2c7968d0c9ecd3f1be245f3ae14f44e4eeb82cd538cfc0f96f1afc4ef0 
\ No newline at end of file
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -69,7 +69,7 @@ with_make_vars_inner() {
 
 with_make_vars() {
 	with_make_vars_inner "$@" \
-	MAKE="make $(make_with_vars_inner printf '\t%s"' | sed -Ee 's/\t([^"]+=)/ \1"/g') "
+	MAKE="make $(with_make_vars_inner printf '\t%s"' | sed -Ee 's/\t([^"=]+=)/ \1"/g') "
 }
 
 sed -i.orig -e "s|/lib/ld-musl-|$musl/"'library.so'"/ld-musl-|" ./gcc/config/*/linux*.h
@@ -150,7 +150,7 @@ repro="$repro -ffile-prefix-map=${src}=builddir"
 	--with-build-time-tools="$pthbs_build_environment/command" \
 	--with-sysroot=/ \
 	FFLAGS="$fl" \
-	LDFLAGS="-s --static $LDFLAGS" \
+	LDFLAGS="--static $LDFLAGS" \
 	AR_FOR_TARGET="$mcm_bin"-ar \
 	AS_FOR_TARGET="$mcm_bin"-as \
 	LD_FOR_TARGET="$mcm_bin"-ld \
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.7d2bfe5f799351d5ce74e22b3ffc93c950e3b5774a1e45d776cc90750ad88f6c
+#+gcc.5beca7eec7865923d13c7d69d094c0fefb26860c899d98413428fee28a6191cf
 #+binutils.06634a7c6783445d52e5e45894b0c379f5be4df44124169e50096929bef7b5ee 
\ No newline at end of file