|
@@ -505,7 +505,7 @@ endef
|
|
endif
|
|
endif
|
|
|
|
|
|
define QT_CONFIGURE_CMDS
|
|
define QT_CONFIGURE_CMDS
|
|
- -[ -f $(@D)/Makefile ] && $(MAKE) -C $(@D) confclean
|
|
|
|
|
|
+ -[ -f $(@D)/Makefile ] && $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) confclean
|
|
$(QT_CONFIGURE_IPV6)
|
|
$(QT_CONFIGURE_IPV6)
|
|
$(QT_CONFIGURE_CONFIG_FILE)
|
|
$(QT_CONFIGURE_CONFIG_FILE)
|
|
# Fix compiler path
|
|
# Fix compiler path
|
|
@@ -527,7 +527,7 @@ define QT_CONFIGURE_CMDS
|
|
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
|
|
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
|
|
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
|
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
|
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
|
|
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
|
|
- $(QT_CONFIGURE_ENV) \
|
|
|
|
|
|
+ $(TARGET_MAKE_ENV) \
|
|
MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \
|
|
MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \
|
|
$(if $(VERBOSE),-verbose,-silent) \
|
|
$(if $(VERBOSE),-verbose,-silent) \
|
|
-force-pkg-config \
|
|
-force-pkg-config \
|
|
@@ -632,7 +632,7 @@ endef
|
|
# remove the sysroot path from them, since pkg-config already adds it
|
|
# remove the sysroot path from them, since pkg-config already adds it
|
|
# automatically.
|
|
# automatically.
|
|
define QT_INSTALL_STAGING_CMDS
|
|
define QT_INSTALL_STAGING_CMDS
|
|
- $(MAKE) -C $(@D) install
|
|
|
|
|
|
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
|
mkdir -p $(HOST_DIR)/usr/bin
|
|
mkdir -p $(HOST_DIR)/usr/bin
|
|
mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
|
|
mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
|
|
ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs
|
|
ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs
|