diff options
| author | Anatol Belski <ab@php.net> | 2018-09-18 10:45:18 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-09-18 10:45:18 +0200 |
| commit | a747db872faddadffcfee4a43607eda25891eb6e (patch) | |
| tree | 06feb73a30bf31b96154aeab16ab109ca0be23fb /win32/build/confutils.js | |
| parent | bc1ecd5d7f059e66088278ea73d5e8ecdd8db5af (diff) | |
| parent | be02b2e8fd47ca3410ca6046b45f38fcc0e9333b (diff) | |
| download | php-git-a747db872faddadffcfee4a43607eda25891eb6e.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add spectre switch for suitable vc14 versions
Diffstat (limited to 'win32/build/confutils.js')
| -rw-r--r-- | win32/build/confutils.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 59f51f249e..1771297a54 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3123,6 +3123,11 @@ function toolset_setup_common_cflags() /* Undocumented. */ ADD_FLAG('CFLAGS', "/d2guardspecload"); } + } else if (1900 == VCVERS) { + var subver1900 = probe_binary(PHP_CL).substr(6); + if (subver1900 >= 24241) { + ADD_FLAG('CFLAGS', "/Qspectre"); + } } } if (VCVERS >= 1900) { |