summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-08-03 14:11:18 +0200
committerAnatol Belski <ab@php.net>2018-08-03 14:11:18 +0200
commit9652fc624acad2ace9effeab76a62efe8c71434a (patch)
tree18629967554b348fe1008f13ce6f270c39c2d1b3
parentdf5e09c5a88fd225e72e35c2796cfec37678fb62 (diff)
parent2ea7222440c92561e9774bb5d32ff1135935ef93 (diff)
downloadphp-git-9652fc624acad2ace9effeab76a62efe8c71434a.tar.gz
Merge branch 'PHP-7.3'
* PHP-7.3: Remove asan incompatible options
-rw-r--r--win32/build/confutils.js3
1 files changed, 0 insertions, 3 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 4a7fa1836c..d11a296783 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -3646,9 +3646,6 @@ function add_asan_opts(cflags_name, libs_name, ldflags_name)
if (!!cflags_name) {
ADD_FLAG(cflags_name, "-fsanitize=address");
ADD_FLAG(cflags_name, "-fsanitize-address-use-after-scope");
- ADD_FLAG(cflags_name, "-fsanitize-cfi-cross-dso");
- ADD_FLAG(cflags_name, "-fsanitize-memory-track-origins");
- ADD_FLAG(cflags_name, "-fsanitize-memory-use-after-dtor");
}
if (!!libs_name) {
if (X64) {