summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-03-07 15:23:03 +0100
committerAnatol Belski <ab@php.net>2018-03-07 15:23:03 +0100
commit2d660dd63059a8e0f7a8d080173efbf74fa2adc8 (patch)
tree2575910380b56c04256cfa1ec4819ff762195848
parent22857f1d89efe73ce5988f254da0cc304a6e8bb1 (diff)
parent00bfc6eb4959d820fbc0b45abe772c22fe70ff4c (diff)
downloadphp-git-2d660dd63059a8e0f7a8d080173efbf74fa2adc8.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Exclude /Qspectre for clang analyzer
-rw-r--r--win32/build/confutils.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 0e68a1c7a8..b682389c89 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2367,7 +2367,8 @@ function handle_analyzer_makefile_flags(fd, key, val)
.replace("/guard:cf ", "")
.replace(/\/MP \d+ /, "")
.replace(/\/MP /, "")
- .replace("/LD ", "");
+ .replace("/LD ", "")
+ .replace("/Qspectre ", "");
} else if ("cppcheck" == PHP_ANALYZER) {
new_val = "";