diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 9e70d49b60..f1390a18d0 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -81,6 +81,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ + -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ $(TOPDIR)/support/misc/cross-compilation.conf.in diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 1977a83501..235e5a8495 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -26,6 +26,9 @@ needs_exe_wrapper = true sys_root = '@STAGING_DIR@' pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' pkg_config_static = '@STATIC@' +# enable meson build to pass a toolchain file to cmake +cmake_toolchain_file = '@HOST_DIR@/share/buildroot/toolchainfile.cmake' +cmake_defaults = false [host_machine] system = 'linux'