mrrl

commit 6e9ad39493fffe97832ef2a4f0cec23c43e4a414
parent 00b9b04ca626489783c18a4be6d001bec38464d0
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed, 17 Dec 2025 00:38:45 +0000

Define arch variable by splitting triplet

Diffstat:
M
templates/pkg/gcc
 | 
5
+++--
M
templates/pkg/musl
 | 
5
+++--

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/templates/pkg/gcc b/templates/pkg/gcc
@@ -1,5 +1,6 @@
 {%- set pkg_version=target_gcc_version|default("13.4.0") -%}
 {%- set pkg_source="tar.xz" -%}
+{%- set arch=triplet.split("-")[0] -%}
 {% extends "genlinks_mini" %}
 {%- do import_functions.update(["build_env_static", "check_static"]) %}
 {%- block template_deps %}{% endblock %}
@@ -122,8 +123,8 @@ repro="$repro -ffile-prefix-map=${src}=builddir"
 	--disable-assembly \
 	--disable-werror \
 	--target={{triplet}} \
-	--build={{triplet.split("-")[0]}}-pc-linux-muslxx \
-	--host={{triplet.split("-")[0]}}-pc-linux-muslxx \
+	--build={{arch}}-pc-linux-muslxx \
+	--host={{arch}}-pc-linux-muslxx \
 	--disable-multilib \
 	--enable-tls \
 	--disable-libmudflap \
diff --git a/templates/pkg/musl b/templates/pkg/musl
@@ -1,6 +1,7 @@
 {%- set gcc_ver=target_gcc_version|default("13.4.0") -%}
 {%- set pkg_version="1.2.5" -%}
 {%- set pkg_source="tar.gz" -%}
+{%- set arch=triplet.split("-")[0] -%}
 {% extends "genlinks_mini" %}
 {% do setitem(env_template, "CPATH", "@ENVROOT@/"~includedir) %}
 {% do setitem(env_template, "LIBRARY_PATH", "@ENVROOT@/"~libdir) %}
@@ -60,13 +61,13 @@ make \
 
 mkdir -p "$dest/{{dynlibdir}}"
 mv -v "$dest/{{libdir}}"/*.so "$dest/{{dynlibdir}}/"
-ln -s -f libc.so "$dest/{{dynlibdir}}/ld-musl-{{triplet.split("-")[0]}}.so.1"
+ln -s -f libc.so "$dest/{{dynlibdir}}/ld-musl-{{arch}}.so.1"
 
 {%- endblock install %}
 {% block genlinks_begin %}
 	{{- super() }}
 	x["./{{dynlibdir}}/libc.so"]=1
-	x["./{{dynlibdir}}/ld-musl-{{triplet.split("-")[0]}}.so.1"]=1
+	x["./{{dynlibdir}}/ld-musl-{{arch}}.so.1"]=1
 
 	x["./{{includedir}}/assert.h"]=1  # standard headers as per C11
 	x["./{{includedir}}/complex.h"]=1