diff options
Diffstat (limited to 'internal/rosa/make.go')
| -rw-r--r-- | internal/rosa/make.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/rosa/make.go b/internal/rosa/make.go index 877648c0..7a8bdec9 100644 --- a/internal/rosa/make.go +++ b/internal/rosa/make.go @@ -120,7 +120,7 @@ func (attr *MakeHelper) script(t Toolchain, name string) string { attr = new(MakeHelper) } cross, arch := t.cross(), t.Arch() - sysroot := "/system/" + arch + sysroot := Prefix + "/" + arch var configure string target := t.triple() @@ -129,7 +129,7 @@ func (attr *MakeHelper) script(t Toolchain, name string) string { export CC='clang --target=` + target + ` --sysroot=` + sysroot + `' export CXX='clang++ --target=` + target + ` --sysroot=` + sysroot + `' export PKG_CONFIG_SYSROOT_DIR='` + sysroot + `' -export PKG_CONFIG_LIBDIR='` + sysroot + `/system/lib/pkgconfig:` + sysroot + `/system/share/pkgconfig' +export PKG_CONFIG_LIBDIR='` + sysroot + Prefix + `/lib/pkgconfig:` + sysroot + Prefix + `/share/pkgconfig' ` } configure += attr.ScriptConfigureEarly @@ -142,7 +142,7 @@ export PKG_CONFIG_LIBDIR='` + sysroot + `/system/lib/pkgconfig:` + sysroot + `/s } if attr.ForceAutoconf || attr.ConfigureName == "" { configure += ` \ - --prefix=/system` + --prefix=` + Prefix host := target build := host if cross { @@ -160,7 +160,7 @@ export PKG_CONFIG_LIBDIR='` + sysroot + `/system/lib/pkgconfig:` + sysroot + `/s } if !attr.OmitSysroot && cross { configure += ` \ - --with-sysroot='/system/` + arch + `'` + --with-sysroot='` + Prefix + `/` + arch + `'` } configure += ` \ --host=` + host |