diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 668995045725b..5e67872728102 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -32,6 +32,10 @@ ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols (--enable if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") { ERROR("Use of both --enable-debug and --enable-debug-pack not allowed."); } +ARG_ENABLE('debug-assertions', 'Release binaries with debug assertions (--enable-debug must not be specified)', "no"); +if (PHP_DEBUG == "yes" && PHP_DEBUG_ASSERTIONS == "yes") { + ERROR("Use of both --enable-debug and --enable-debug-assertions not allowed."); +} if (PHP_DEBUG == "yes") { ADD_FLAG("CFLAGS"," /Wall "); diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 95a4e5ce3c136..49e15834fd63f 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -456,7 +456,7 @@ can be built that way. \ var snapshot_build_exclusions = new Array( 'debug', 'lzf-better-compression', 'php-build', 'snapshot-template', 'zts', 'ipv6', 'fd-setsize', 'pgi', 'pgo', 'all-shared', 'config-profile', 'sanitizer', - 'phpdbg-debug' + 'phpdbg-debug', 'debug-assertions' ); var force; @@ -3475,10 +3475,15 @@ function toolset_setup_build_mode() } ADD_FLAG("CFLAGS", "/LD /MD"); if (PHP_SANITIZER == "yes" && CLANG_TOOLSET) { - ADD_FLAG("CFLAGS", "/Od /D NDebug /D NDEBUG /D ZEND_WIN32_NEVER_INLINE /D ZEND_DEBUG=0"); + ADD_FLAG("CFLAGS", "/Od /D NDebug /D ZEND_WIN32_NEVER_INLINE"); } else { // Equivalent to Release_TSInline build -> best optimization - ADD_FLAG("CFLAGS", "/Ox /D NDebug /D NDEBUG /GF /D ZEND_DEBUG=0"); + ADD_FLAG("CFLAGS", "/Ox /D NDebug /GF"); + } + if (PHP_DEBUG_ASSERTIONS == "yes") { + ADD_FLAG("CFLAGS", "/D ZEND_DEBUG=1"); + } else { + ADD_FLAG("CFLAGS", "/D ZEND_DEBUG=0 /D NDEBUG"); } // if you have VS.Net /GS hardens the binary against buffer overruns diff --git a/win32/winutil.c b/win32/winutil.c index e09944d131b9b..6e4325dcaecca 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -486,7 +486,7 @@ PHP_WINUTIL_API BOOL php_win32_crt_compatible(char **err) {/*{{{*/ #if PHP_LINKER_MAJOR == 14 /* Extend for other CRT if needed. */ -# if PHP_DEBUG +# if _DEBUG const char *crt_name = "vcruntime140d.dll"; # else const char *crt_name = "vcruntime140.dll";