summaryrefslogtreecommitdiffstats
path: root/src/core/gyp_run.pro
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-21 16:01:46 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-03-07 17:08:45 +0000
commit93ca852dbf00e93c07269e8cca389bc1222130d3 (patch)
tree62b541249b8908d717f877c9adb811930bd78a24 /src/core/gyp_run.pro
parenta24df8f8e4ef0f99dbf5a6b09451bb39becaf66a (diff)
Basic adaptation to Chromium 49
Converts types, callbacks and headers to match Chromium 49. Task-number: QTBUG-51173 Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/gyp_run.pro')
-rw-r--r--src/core/gyp_run.pro6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index c34bc9a47..e83db387b 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -44,11 +44,11 @@ cross_compile {
# Needed for v8, see chromium/v8/build/toolchain.gypi
GYP_CONFIG += CXX=\"$$which($$QMAKE_CXX)\"
}
+else {
+ GYP_CONFIG += sysroot=\"\"
+}
contains(QT_ARCH, "arm") {
- # Chromium will set a default sysroot on arm unless we give it one.
- !cross_compile: GYP_CONFIG += sysroot=\"\"
-
GYP_CONFIG += target_arch=arm
# Extract ARM specific compiler options that we have to pass to gyp,