diff --git a/ports/install.sh b/ports/install.sh index 7c9fce3d..ad360591 100755 --- a/ports/install.sh +++ b/ports/install.sh @@ -42,8 +42,9 @@ fi export MESON_CROSS_FILE="$BANAN_PORT_DIR/$BANAN_ARCH-banan_os-meson.txt" if [ ! -f "$MESON_CROSS_FILE" ] || [ "$MESON_CROSS_FILE" -ot "$BANAN_TOOLCHAIN_DIR/meson-cross-file.in" ]; then cp "$BANAN_TOOLCHAIN_DIR/meson-cross-file.in" "$MESON_CROSS_FILE" - sed -i "s/ARCH/$BANAN_ARCH/" "$MESON_CROSS_FILE" - sed -i "s/SYSROOT/$BANAN_SYSROOT/" "$MESON_CROSS_FILE" + sed -i "s|ARCH|$BANAN_ARCH|" "$MESON_CROSS_FILE" + sed -i "s|CMAKE|$BANAN_CMAKE|" "$MESON_CROSS_FILE" + sed -i "s|SYSROOT|$BANAN_SYSROOT|" "$MESON_CROSS_FILE" fi MAKE_BUILD_TARGETS=('all') diff --git a/toolchain/meson-cross-file.in b/toolchain/meson-cross-file.in index 683d6b56..432891f3 100644 --- a/toolchain/meson-cross-file.in +++ b/toolchain/meson-cross-file.in @@ -11,7 +11,8 @@ ar = 'ARCH-pc-banan_os-ar' ld = 'ARCH-pc-banan_os-ld' objcopy = 'ARCH-pc-banan_os-objcopy' strip = 'ARCH-pc-banan_os-strip' -pkgconfig = 'pkg-config' +pkg-config = 'pkg-config' +cmake = 'CMAKE' [properties] sys_root='SYSROOT'