From 7d1a6f4012576360bd9b9f9746fe8830f3cc7511 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Tue, 11 Jun 2019 22:27:29 -0700 Subject: [PATCH] fix qt5 toolchain settings --- package/lean/qt5/Makefile | 1 + package/lean/qt5/files/qmake.conf | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package/lean/qt5/Makefile b/package/lean/qt5/Makefile index 6e50aef64..2f8064e9f 100644 --- a/package/lean/qt5/Makefile +++ b/package/lean/qt5/Makefile @@ -19,6 +19,7 @@ PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION).$(PKG_REL PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 + include $(INCLUDE_DIR)/package.mk # not using sstrip here as this fucks up the .so's somehow diff --git a/package/lean/qt5/files/qmake.conf b/package/lean/qt5/files/qmake.conf index 388e823cc..20491903a 100644 --- a/package/lean/qt5/files/qmake.conf +++ b/package/lean/qt5/files/qmake.conf @@ -13,14 +13,21 @@ include(../common/g++-unix.conf) # modifications to g++.conf QMAKE_CC = $(TARGET_CROSS)gcc QMAKE_CXX = $(TARGET_CROSS)g++ -QMAKE_CFLAGS += -mips32r2 -mtune=24kc -msoft-float -QMAKE_CXXFLAGS += $${QMAKE_CFLAGS} -QMAKE_LINK = $(TARGET_CROSS)g++ -QMAKE_LINK_SHLIB = $(TARGET_CROSS)g++ + +QMAKE_CFLAGS += $$(TARGET_CFLAGS) +QMAKE_CXXFLAGS += $$(TARGET_CXXFLAGS) +QMAKE_LFLAGS += $$(TARGET_LDFLAGS) + +QMAKE_LINK_C = $$QMAKE_CC +QMAKE_LINK_C_SHLIB = $$QMAKE_CC +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX # modifications to linux.conf QMAKE_AR = $(TARGET_CROSS)ar cqs QMAKE_OBJCOPY = $(TARGET_CROSS)objcopy QMAKE_NM = $(TARGET_CROSS)nm -P QMAKE_STRIP = $(TARGET_CROSS)strip + + load(qt_config)