diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-12 11:09:26 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-12 13:43:12 +0200 |
| commit | 2134740e59ddf8e67c927b068607012d87222a17 (patch) | |
| tree | 983fd7942f78302c11e7de57039d59a7e9838a81 /qmake | |
| parent | 64f62105ce8a1940125f3ae7b3fee14152f46944 (diff) | |
Disable the PCRE Jit when compiling qmake
I'm getting compile errors with gcc 9.3 without this, and it
makes sense to disable the JIT in bootstrapped builds anyway.
Change-Id: Ife867bd2d6fd0bf133edae4903bb6b6d295db547
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 3 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
| -rw-r--r-- | qmake/qmake.pro | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 1cdf9dee4b..98d255f2d5 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -179,7 +179,8 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER \ - -DPCRE2_CODE_UNIT_WIDTH=16 -DHAVE_CONFIG_H\ + -DPCRE2_CODE_UNIT_WIDTH=16 -DHAVE_CONFIG_H \ + -DPCRE2_DISABLE_JIT \ $(EXTRA_CPPFLAGS) CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS) diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 52a7a607e6..d3a85c17b2 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -40,7 +40,7 @@ CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \ -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DUNICODE -D_ENABLE_EXTENDED_ALIGNED_STORAGE \ - -DPCRE2_CODE_UNIT_WIDTH=16 -DHAVE_CONFIG_H -DPCRE2_STATIC + -DPCRE2_CODE_UNIT_WIDTH=16 -DHAVE_CONFIG_H -DPCRE2_STATIC -DPCRE2_DISABLE_JIT CFLAGS = $(CFLAGS_BARE) $(CFLAGS) diff --git a/qmake/qmake.pro b/qmake/qmake.pro index c64017f05b..243f07ac2c 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -15,7 +15,8 @@ DEFINES += \ $$shell_quote(QT_VERSION_STR=\"$$QT_VERSION\") \ QT_VERSION_MAJOR=$$QT_MAJOR_VERSION \ QT_VERSION_MINOR=$$QT_MINOR_VERSION \ - QT_VERSION_PATCH=$$QT_PATCH_VERSION + QT_VERSION_PATCH=$$QT_PATCH_VERSION \ + PCRE2_DISABLE_JIT win32: DEFINES += \ UNICODE \ |