X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Ftest-build;h=6472895698bb3bd5d396ad726276242987210a04;hb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;hp=629e537c4917dcad43beaec921f34241dc3e7f0e;hpb=eaa3de48d2481c06a6ed5896b0a28f9c67aa7afb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/tools/test-build b/tools/test-build index 629e537c4..647289569 100755 --- a/tools/test-build +++ b/tools/test-build @@ -30,6 +30,9 @@ use feature ':5.10'; use strict; use warnings FATAL => qw(all); +use FindBin qw($RealDir); + +use lib $RealDir; use make::common; use make::configure; @@ -48,7 +51,6 @@ foreach my $compiler (@compilers) { push @socketengines, 'epoll' if test_header $compiler, 'sys/epoll.h'; push @socketengines, 'kqueue' if test_file $compiler, 'kqueue.cpp'; push @socketengines, 'poll' if test_header $compiler, 'poll.h'; - push @socketengines, 'ports' if test_header $compiler, 'ports.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}; @@ -56,14 +58,8 @@ foreach my $compiler (@compilers) { say "Failed to configure using the $compiler compiler and the $socketengine socket engine!"; exit 1; } - $ENV{INSPIRCD_STATIC} = 1; - if (system 'make', '-j'.get_cpu_count, 'install') { - say "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!"; - exit 1; - } - delete $ENV{INSPIRCD_STATIC}; - if (system 'make', '-j'.get_cpu_count, 'install') { - say "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!"; + if (system 'make', '--jobs', get_cpu_count, 'install') { + say "Failed to compile using the $compiler compiler and the $socketengine socket engine!"; exit 1; } say "Building using the $compiler compiler and the $socketengine socket engine succeeded!";