Skip to content

[PHP next] Support --enable-debug-assertions configure option on Windows #15544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[PHP next] Support --enable-debug-assertions configure option on Windows #15544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
181b375
Support --enable-debug-assertions configure option on Windows
cmb69 Aug 22, 2024
5ffe299
Fix erroneous preprocessor check
cmb69 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions win32/build/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ");
Expand Down
11 changes: 8 additions & 3 deletions win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion win32/winutil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down