openwrt/video
1
0
Fork 0
mirror of https://github.com/openwrt/video.git synced 2026-04-15 19:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "qt5base: also pass MAKE_VARS and MAKE_FLAGS"

Browse Source 
This reverts commit 6f98fdca5a.
This commit is contained in:
Mirko Vogt
2016-11-23 23:22:57 +01:00
parent 6f98fdca5a
commit 10ed06e0bd
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frameworks/qt5base/files/qmake.mk
View File

@@ -78,15 +78,18 @@ define Build/Configure/Default
$(PKG_BUILD_DIR)/$(MAKE_PATH)/$(if $(1),$(1),$(PKG_NAME)).pro
endef
# we need to pass everything to $(MAKE) as well, as Makefiles may invoke qmake once again for creating further Makefiles
# We need to pass all qmake related variables to $(MAKE) as well, as (generated) Makefiles may invoke qmake once again for creating further Makefiles.
# Actually we'd also like to pass $MAKE_VARS and $MAKE_FLAGS to also make ordinary non-qmake generated Makefiles calling toolchain executables
# like $CC/$CXX/.. work, however this would interfere with qmake generated Makefiles, since they expect variables being set differently.
# For example qmake generated Makefiles expect $AR to also contain ar's arguments, while ordinary Makefiles don't.
# Until we find a way to disginguish both kinds of Makefiles, we will neglect ordinary Makefiles calling toolchain executables.
# Mixing qmake generated and ordinary Makfiles - both calling toolchain executables - is probably a very rare case anyway.
define Build/Compile/Default
+$(MAKE_VARS) \
TARGET_CROSS="$(TARGET_CROSS)" \
+TARGET_CROSS="$(TARGET_CROSS)" \
TARGET_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
TARGET_CXXFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS)" \
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_FLAGS) \
$(1)
endef