diff options
| author | Martin Storsjö <martin@martin.st> | 2018-01-06 00:09:14 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2018-01-23 19:19:46 +0000 |
| commit | e39a9de3309f84be4101da839a0bacf69090706f (patch) | |
| tree | 7d91df543adc624624fd48174d104577813dd39f /src/3rdparty | |
| parent | 5c0bd3961fa17d594e2a14d142b75c0002856595 (diff) | |
pcre2: Disable JIT on windows on arm/arm64
sljit, the JIT in pcre2, doesn't quite fully work on windows on
arm yet (although the subset of functionality used by pcre2 might
mostly work). On arm64, it fails to compile (although working around
that failure is pretty easy), when using clang in MinGW mode
(where __GNUC__ is defined, making the JIT auto-enabled).
Disable it in these configurations until it has been fully tested
and fixed upstream first.
Change-Id: Ie9681cb7cdd1960586ba194c71e057eb918cb419
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/pcre2/pcre2.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/pcre2/pcre2.pro b/src/3rdparty/pcre2/pcre2.pro index 3dde2f62f8..296e65cd59 100644 --- a/src/3rdparty/pcre2/pcre2.pro +++ b/src/3rdparty/pcre2/pcre2.pro @@ -16,6 +16,8 @@ DEFINES += HAVE_CONFIG_H # platform/compiler specific definitions uikit|qnx|winrt: DEFINES += PCRE2_DISABLE_JIT +win32:contains(QT_ARCH, "arm"): DEFINES += PCRE2_DISABLE_JIT +win32:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT SOURCES += \ $$PWD/src/pcre2_auto_possess.c \ |