blob: d084bffce54cc24cc00837a0e6e64e597f7908ca (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Mon, 15 Feb 2016 16:39:24 +0100
Subject: [PATCH] qtwebengine: make sure sysroot is always set on ARM
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
qtwebengine/src/core/gyp_run.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qtwebengine/src/core/gyp_run.pro b/qtwebengine/src/core/gyp_run.pro
index 5bedc9acbc29..8ad87b352ea3 100644
--- a/qtwebengine/src/core/gyp_run.pro
+++ b/qtwebengine/src/core/gyp_run.pro
@@ -47,7 +47,7 @@ cross_compile {
contains(QT_ARCH, "arm") {
# Chromium will set a default sysroot on arm unless we give it one.
- !cross_compile: GYP_CONFIG += sysroot=\"\"
+ !cross_compile|isEmpty(TOOLCHAIN_SYSROOT): GYP_CONFIG += sysroot=\"\"
GYP_CONFIG += target_arch=arm
|
