From 1b52360ec26fa666d70430a1c81804933480b0d2 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Tue, 12 Apr 2016 10:29:30 +0200
Subject: Fix merge duplication

We already set sysroot to empty for all none cross_compile builds in
the 5.7 branch.

Change-Id: I99626694983c776f46d0e5daa9b1e39614266cb6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/core/gyp_run.pro | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/core/gyp_run.pro')

diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 51fe9ad1d..50b6c5112 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -84,7 +84,6 @@ contains(QT_ARCH, "arm") {
 }
 
 contains(QT_ARCH, "mips") {
-    !cross_compile: GYP_CONFIG += sysroot=\"\"
     GYP_CONFIG += target_arch=mipsel
 
     contains(QMAKE_CFLAGS, "mips32r6"): mips_arch_variant=\"r6\"
-- 
cgit v1.2.3