summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-10 14:46:24 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-06-13 13:38:26 +0000
commitc7aeb3b03ecce75c40d3f53352e8b7b3a4d6d050 (patch)
tree2b805a2fde7d656f37a686c787e57a77e76ae06d /src
parent0f51b90fd881910825f1a8584d420f5fdd7365d9 (diff)
Enable -fno_delete_null_pointer_checks on V8 for G++ 6
Detect g++ 6 and disable null pointer check optimizations on v8. Change-Id: I5064823af3784786d455ce86592b5e65c1020f21 Task-number: QTBUG-53956 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
m---------src/3rdparty0
-rw-r--r--src/core/config/linux.pri2
2 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 168cc2b83c53e4e68bf89b331d92da88a99d2bf
+Subproject ba36da6c1f59da7687f6924cc558105dcd1c44d
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 8854a4bdf..b579e2a3f 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -29,6 +29,8 @@ use?(nss) {
use_openssl_certs=1
}
+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += v8_no_delete_null_pointer_checks=1
+
contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1
contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1