From 04b5090a2f65a2e3380a32e5cd0b4936716ec394 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 18 Jan 2020 13:32:41 +0000 Subject: Disable auto extras when TEST_BUILD_MODULES is set in test-build. --- tools/test-build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tools/test-build') diff --git a/tools/test-build b/tools/test-build index 978b60bc1..48988b687 100755 --- a/tools/test-build +++ b/tools/test-build @@ -55,8 +55,12 @@ foreach my $compiler (@compilers) { push @socketengines, 'poll' if test_header $compiler, 'poll.h'; foreach my $socketengine (@socketengines) { say "Attempting to build using the $compiler compiler and the $socketengine socket engine..."; - system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES} if defined $ENV{TEST_BUILD_MODULES}; - if (system './configure', '--development', '--socketengine', $socketengine) { + my @configure_flags; + if (defined $ENV{TEST_BUILD_MODULES}) { + system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES}; + push @configure_flags, '--disable-auto-extras'; + } + if (system './configure', '--development', '--socketengine', $socketengine, @configure_flags) { say "Failed to configure using the $compiler compiler and the $socketengine socket engine!"; exit 1; } -- cgit v1.2.3