From c588754eb497f1b4e6a1daf23210e883b3de7669 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Mon, 28 Apr 2014 14:57:34 +0200
Subject: Set target_arch based on QT_ARCH for x86 and x86_64

This is needed when cross-compiling for the emulator.

Change-Id: I499c97df2deba8b91162c8f636bb5a25eba1bc29
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
 src/core/gyp_run.pro | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 9bfa6268b..874434e40 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -73,6 +73,9 @@ cross_compile {
     GYP_ARGS += "-D CXX=\"$$which($$QMAKE_CXX)\""
 }
 
+contains(QT_ARCH, "x86_64"): GYP_ARGS += "-D target_arch=x64"
+contains(QT_ARCH, "i386"): GYP_ARGS += "-D target_arch=ia32"
+
 contains(WEBENGINE_CONFIG, proprietary_codecs): GYP_ARGS += "-Dproprietary_codecs=1 -Dffmpeg_branding=Chrome -Duse_system_ffmpeg=0"
 
 !build_pass {
-- 
cgit v1.2.3