diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-01 12:46:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 12:46:41 +0200 |
| commit | 7c76e0c8c3dda5c88f761176cb93445b3214ea21 (patch) | |
| tree | d542e5d13a675261d6dd4f1cbc7c47bcfccad688 /modules | |
| parent | dafcd06bd157a25049886b2b50e4595299428e2c (diff) | |
| parent | 566c0f675a5d998171cdd8fa1e920af40a24d5dd (diff) | |
Merge pull request #10853 from leezh/pcre_html5_fix
Disabled PCRE-JIT in HTML5. Fixes #10834
[ci skip]
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/regex/SCsub | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/regex/SCsub b/modules/regex/SCsub index 0fbdf97620..2dfc2739e9 100644 --- a/modules/regex/SCsub +++ b/modules/regex/SCsub @@ -8,8 +8,11 @@ env_regex.Append(CPPFLAGS=["-DPCRE2_CODE_UNIT_WIDTH=0"]) env_regex.add_source_files(env.modules_sources, "*.cpp") if (env['builtin_pcre2'] != 'no'): - thirdparty_dir = "#thirdparty/pcre2/src/" - thirdparty_flags = ["-DPCRE2_STATIC", "-DHAVE_CONFIG_H", "-DSUPPORT_JIT"] + jit_blacklist = ['javascript'] + thirdparty_dir = '#thirdparty/pcre2/src/' + thirdparty_flags = ['-DPCRE2_STATIC', '-DHAVE_CONFIG_H'] + if 'platform' in env and env['platform'] not in jit_blacklist: + thirdparty_flags.append('-DSUPPORT_JIT') thirdparty_sources = [ "pcre2_auto_possess.c", "pcre2_chartables.c", |