diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-19 13:10:54 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-19 20:00:56 +0200 |
| commit | f111c376d6535ef8c60a34ddd4682fcfa0f4e2bb (patch) | |
| tree | 4ac6ab852ca9a854f3303cf7b5e8f8e318bc4720 /src/3rdparty | |
| parent | 9c89743d726c248785cfed5ea83299e542001018 (diff) | |
Granularily disable PCRE2 JIT on macOS ARM
2f8df4d1a87df9dd67913b016171dac20839d16e disabled the PCRE2 JIT on macOS
for ARM, but did so based on the build system architecture configure
test. When doing a universal build these configure tests are based on
the primary architecture (x86_64 in our case), which means we ended up
still enabling the JIT.
We work around it by passing the PCRE2_DISABLE_JIT define only when
building the arm64 slice.
Change-Id: I60df82acb57030ccef8b117a40209eb107b1d5bd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/pcre2/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt index 23b6e738cd..f44d4bbd79 100644 --- a/src/3rdparty/pcre2/CMakeLists.txt +++ b/src/3rdparty/pcre2/CMakeLists.txt @@ -67,10 +67,9 @@ qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUA PCRE2_DISABLE_JIT ) -qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64") - DEFINES - PCRE2_DISABLE_JIT -) +if (APPLE) + target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64 -DPCRE2_DISABLE_JIT") +endif() qt_internal_extend_target(BundledPcre2 CONDITION WIN32 PUBLIC_DEFINES |