php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move ARG_ENABLE() "macros" out of confutils.js (GH-16398)

Browse Source 
While these "macros" work perfectly fine in confutils, it is somewhat
strange to have these two there, while all others are in config.w32
files.

In particular, there is no need for a `MODE_PHPIZE` guard, since there
are already config.w32 and config.w32.phpize.in.

However, we need to replace the semicolon in the helptext, because the
regex which parses ARG_(ENABLE|WITH) calls is restricted, and does not
accept semicolons.
This commit is contained in:
Christoph M. Becker
2024-10-19 15:26:53 +02:00
committed by GitHub
parent a00c73458f
commit 9504fcfc0f
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
win32/build/config.w32
View File

@@ -396,3 +396,7 @@ ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations
might not work properly, if the chosen instruction sets are not available on the target \
processor.", "no");
toolset_setup_intrinsic_cflags();
ARG_ENABLE('snapshot-build', 'Build a snapshot: turns on everything it can and ignores build errors', 'no');
ARG_ENABLE('vs-link-compat', 'Allow linking of libraries built with compatible versions of VS toolset', 'yes');

2
win32/build/config.w32.phpize.in
View File

@@ -143,3 +143,5 @@ ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations
might not work properly, if the optimizations are not available on the target \
processor.", "no");
toolset_setup_intrinsic_cflags();
ARG_ENABLE('vs-link-compat', 'Allow linking of libraries built with compatible versions of VS toolset', 'yes');

9
win32/build/confutils.js
View File

@@ -2898,9 +2898,6 @@ function PHP_INSTALL_HEADERS(dir, headers_list)
// and you can then build everything, ignoring fatal errors within a module
// by running "nmake snap"
PHP_SNAPSHOT_BUILD = "no";
if (!MODE_PHPIZE) {
ARG_ENABLE('snapshot-build', 'Build a snapshot; turns on everything it can and ignores build errors', 'no');
}
function toolset_option_handle()
{
@@ -3766,9 +3763,3 @@ function setup_verbosity()
CMD_MOD2 = "@";
}
}
try {
ARG_ENABLE('vs-link-compat', 'Allow linking of libraries built with compatible versions of VS toolset', 'yes');
} catch (e) {
STDOUT.WriteLine("problem: " + e);
}