diff options
| author | Mirko Vogt | 2017-02-21 18:16:52 +0000 |
|---|---|---|
| committer | Mirko Vogt | 2017-02-21 18:19:20 +0000 |
| commit | c26c09e61bea8875b73c99c154773a8f87c53625 (patch) | |
| tree | 6c40053b8da0616af2d9ac1460b5e2ac50548da4 | |
| parent | 2190867b246d2832b62b9f41b5b5082becbd083d (diff) | |
| download | video-c26c09e61bea8875b73c99c154773a8f87c53625.tar.gz | |
use variables for calling qmake
We need to distinguish as carefully as possible
between qmake for the host builds and qmake for
target builds
| -rw-r--r-- | frameworks/qt5base/files/qmake.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/frameworks/qt5base/files/qmake.mk b/frameworks/qt5base/files/qmake.mk index 3feabc6..80066dc 100644 --- a/frameworks/qt5base/files/qmake.mk +++ b/frameworks/qt5base/files/qmake.mk @@ -74,18 +74,21 @@ HOST_INSTALL_DIR_ROOT:=$(HOST_INSTALL_DIR) HOST_INSTALL_DIR:=$(HOST_INSTALL_DIR_ROOT)/$(STAGING_DIR_HOST) #HOST_INSTALL_DIR:=$(HOST_INSTALL_DIR_ROOT)/$(STAGING_DIR) +QMAKE_TARGET=$(STAGING_DIR)/bin/qmake +QMAKE_HOST=$(STAGING_DIR_HOST)/bin/qmake + define Build/Configure/Default TARGET_CROSS="$(TARGET_CROSS)" \ TARGET_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ TARGET_CXXFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - qmake \ + $(QMAKE_TARGET) \ -o $(PKG_BUILD_DIR)/$(MAKE_PATH)/Makefile \ $(PKG_BUILD_DIR)/$(MAKE_PATH)/$(if $(1),$(1).pro,) endef define Host/Configure/Default - qmake_host \ + $(QMAKE_HOST) \ -o $(HOST_BUILD_DIR)/$(MAKE_PATH)/Makefile \ $(HOST_BUILD_DIR)/$(MAKE_PATH)/$(if $(1),$(1).pro,) endef @@ -106,9 +109,6 @@ define Build/Compile/Default endef define Host/Compile/Default - +TARGET_CFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ - TARGET_CXXFLAGS="$(HOST_CPPFLAGS) $(HOST_CXXFLAGS)" \ - TARGET_LDFLAGS="$(HOST_LDFLAGS)" \ $(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR)/$(MAKE_PATH) \ $(1) endef |