forked from pool/libqt5-qtwebengine
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
From c7aeb3b03ecce75c40d3f53352e8b7b3a4d6d050 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
||
|
|
Date: Fri, 10 Jun 2016 14:46:24 +0200
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
src/3rdparty | 2 +-
|
||
|
|
src/core/config/linux.pri | 2 ++
|
||
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
|
||
|
|
index 8854a4b..b579e2a 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
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|