From 53e9dd6aa933c1a5b43da83a88d5e07bf27285bf Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 28 Oct 2026 03:05:09 +0900 Subject: internal/rosa: do not hard code prefix This allows the prefix to be changed, at runtime if needed. Signed-off-by: Ophestra --- internal/rosa/meson.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'internal/rosa/meson.go') diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go index 9231880a..5e64bf62 100644 --- a/internal/rosa/meson.go +++ b/internal/rosa/meson.go @@ -60,10 +60,10 @@ func (*MesonHelper) paths(t Toolchain) []pkg.ExecPath { false, pkg.NewFile("mfile-"+arch, []byte(`# meson env2mfile [binaries] # Compilers -c = ['clang', '--target=`+target+`', '--sysroot=/system/`+arch+`'] -cpp = ['clang++', '--target=`+target+`', '--sysroot=/system/`+arch+`'] +c = ['clang', '--target=`+target+`', '--sysroot=`+Prefix+`/`+arch+`'] +cpp = ['clang++', '--target=`+target+`', '--sysroot=`+Prefix+`/`+arch+`'] pkg-config = ['pkg-config'] -exe_wrapper = ['qemu-`+t.linuxArch()+`', '-L', '/system/`+arch+`'] +exe_wrapper = ['qemu-`+t.linuxArch()+`', '-L', '`+Prefix+`/`+arch+`'] # Other binaries ar = ['llvm-ar'] @@ -73,10 +73,10 @@ strip = ['llvm-strip'] [built-in options] [properties] -sys_root = '/system/`+arch+`' +sys_root = '`+Prefix+`/`+arch+`' pkg_config_libdir = [ - '/system/`+arch+`/system/lib/pkgconfig', - '/system/`+arch+`/system/share/pkgconfig' + '`+Prefix+`/`+arch+Prefix+`/lib/pkgconfig', + '`+Prefix+`/`+arch+Prefix+`/share/pkgconfig' ] [host_machine] @@ -155,7 +155,7 @@ func (attr *MesonHelper) script(t Toolchain, name string) string { var setupArgs string if t.cross() { - setupArgs += " --cross-file=/system/mfile" + setupArgs += " --cross-file=" + Prefix + "/mfile" } return ` @@ -163,7 +163,7 @@ func (attr *MesonHelper) script(t Toolchain, name string) string { ` + strings.Join(slices.Collect(func(yield func(string) bool) { for _, v := range append([]KV{ {"wrap_mode", "nofallback"}, - {"prefix", "/system"}, + {"prefix", Prefix}, {"buildtype", "release"}, }, attr.Setup...) { s := v[0] -- cgit v1.3.1