compile mkv8snapshot in host mode

this permits actually using it for x-compiles Change-Id: Id89e53cf2394e6f6773e2b06946769d4951eae80 Reviewed-by: Oswald Buddenhagen <[email protected]>
meta-qt5 · Jun 13, 2012 · daab0ec · daab0ec
1 parent f061136
commit daab0ec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
@@ -1,10 +1,7 @@
-TEMPLATE        = app
-TARGET          = mkv8snapshot
-QT              =
-CONFIG          -= app_bundle
-CONFIG          -= qt
-CONFIG          += console
-CONFIG          += warn_off
+option(host_build)
+TARGET          = mkv8snapshot$$qtPlatformTargetSuffix()
+CONFIG          -= qt app_bundle
+CONFIG          += console warn_off
 
 DESTDIR         = ../../../bin
 LIBS            =
@@ -13,12 +10,6 @@ OBJECTS_DIR     = .
 contains(QT_CONFIG, build_all): CONFIG += build_all
 win32|mac:!macx-xcode: CONFIG += debug_and_release
 
-TARGET = $$TARGET$$qtPlatformTargetSuffix()
-
-cross_compile {
-    equals(QT_ARCH, arm): V8_TARGET_ARCH = arm
-}
-
 include(../../v8/v8.pri)
 
 cross_compile {

diff --git a/src/tools/tools.pro b/src/tools/tools.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS =
-!cross_compile:contains(QT_CONFIG, v8snapshot): SUBDIRS += mkv8snapshot
+contains(QT_CONFIG, v8snapshot): SUBDIRS += mkv8snapshot
diff --git a/src/v8/v8.pro b/src/v8/v8.pro
@@ -22,7 +22,7 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
 
 include(v8.pri)
 
-!cross_compile:contains(QT_CONFIG, v8snapshot) {
+contains(QT_CONFIG, v8snapshot) {
     mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
     DUMMY_FILE = v8.pro
     mkv8snapshot.input = DUMMY_FILE