summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make1
-rw-r--r--config.in5
-rw-r--r--mkspecs/qws/linux-oe-g++/qmake.conf2
3 files changed, 7 insertions, 1 deletions
diff --git a/Vars.make b/Vars.make
index 238918f..fe4f397 100644
--- a/Vars.make
+++ b/Vars.make
@@ -20,8 +20,9 @@ else
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
diff --git a/config.in b/config.in
index d9659be..323ca51 100644
--- a/config.in
+++ b/config.in
@@ -41,8 +41,13 @@ 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
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
@@ -7,9 +7,9 @@
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