| -rw-r--r-- | Vars.make | 1 | ||||
| -rw-r--r-- | config.in | 5 | ||||
| -rw-r--r-- | mkspecs/qws/linux-oe-g++/qmake.conf | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -18,12 +18,13 @@ ifndef CONFIG_TARGET_OE else OEDIR:=$(CONFIG_OE_BUILD_DIR) QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 $(shell mkdir -p $(QTDIR)/src/moc) $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) PLATFORM=sharp-linux + OEHOSTSYS:=$(CONFIG_OE_HOST_SYS) endif ifdef CONFIG_TARGET_X86 PLATFORM=x86-linux endif ifdef CONFIG_TARGET_SHARP @@ -39,12 +39,17 @@ endchoice config OE_BUILD_DIR depends TARGET_OE string "OE build directory" default ">>>set OpenEmbedded build directory here<<<" +config OE_HOST_SYS + depends TARGET_OE + string "OE host system" + default "i686-linux" + config OPTIMIZE boolean "Use optimizations" default "y" if ! TARGET_X86 config THREADED boolean "Enable threaded build" diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf index c4c273f..90166b0 100644 --- a/mkspecs/qws/linux-oe-g++/qmake.conf +++ b/mkspecs/qws/linux-oe-g++/qmake.conf @@ -5,13 +5,13 @@ # MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt link_prl -STAGING_BINDIR = $(OEDIR)/tmp/staging/i686-linux/bin +STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib QMAKE_CC = $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc QMAKE_LEX = flex |