Hard code the path to /usr/lib as $libdir shall be overwritten, given that we use a custom sysroot path for purecap.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- meta-morello-toolchain/conf/layer.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-morello-toolchain/conf/layer.conf b/meta-morello-toolchain/conf/layer.conf index cb4c909..907f1f4 100644 --- a/meta-morello-toolchain/conf/layer.conf +++ b/meta-morello-toolchain/conf/layer.conf @@ -12,7 +12,7 @@ LAYERDEPENDS_meta-morello-toolchain = " \ " LAYERSERIES_COMPAT_meta-morello-toolchain = "kirkstone"
-PURECAP_SYSROOT_DIR ??= "${libdir}/${GLOBAL_ARCH_TRIPLE}" +PURECAP_SYSROOT_DIR ??= "/usr/lib/${GLOBAL_ARCH_TRIPLE}"
C64_ARCH_TRIPLE ??= "aarch64-linux-musl_purecap" A64_ARCH_TRIPLE ??= "aarch64-linux-gnu" @@ -21,7 +21,7 @@ A64_LIB_TRIPLE ??= "aarch64-unknown-linux-gnu" C64_LIB_TRIPLE ??= "aarch64-unknown-linux-musl_purecap"
A64_ARCH_FLAGS ??= "-march=armv8" -C64_ARCH_FLAGS ??= "-march=morello+c64 -mabi=purecap" +C64_ARCH_FLAGS ??= "-march=morello -mabi=purecap"
GLOBAL_ARCH_TRIPLE ??= "${C64_ARCH_TRIPLE}" GLOBAL_LIB_TRIPLE ??= "${C64_LIB_TRIPLE}"