Skip to content

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

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

Merged
merged 1 commit into from
Oct 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -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 changes: 2 additions & 0 deletions win32/build/config.w32.phpize.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 0 additions & 9 deletions win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down Expand Up @@ -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);
}