qt: use $(TARGET_MAKE_ENV) when calling $(MAKE)
authorGustavo Zacarias <gustavo.zacarias@free-electrons.com>
Fri, 28 Oct 2016 13:18:29 +0000 (10:18 -0300)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 29 Oct 2016 13:55:00 +0000 (15:55 +0200)
We drop the usage of the QT_CONFIGURE_ENV variable, because it isn't
defined anywhere, so it's always empty.

Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/qt/qt.mk

index 8c0ff7b034a2992fe34dc0cdc912e4e9118bc836..29dcc46b7b793d530dfdbd5ba4dc70140d5d9d19 100644 (file)
@@ -505,7 +505,7 @@ endef
 endif
 
 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_CONFIG_FILE)
        # Fix compiler path
@@ -527,7 +527,7 @@ define QT_CONFIGURE_CMDS
                PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
                PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-               $(QT_CONFIGURE_ENV) \
+               $(TARGET_MAKE_ENV) \
                MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \
                $(if $(VERBOSE),-verbose,-silent) \
                -force-pkg-config \
@@ -632,7 +632,7 @@ endef
 # remove the sysroot path from them, since pkg-config already adds it
 # automatically.
 define QT_INSTALL_STAGING_CMDS
-       $(MAKE) -C $(@D) install
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
        mkdir -p $(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