diff options
author | Peter Powell <petpow@saberuk.com> | 2018-07-31 00:49:27 +0100 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2018-07-31 03:20:18 +0100 |
commit | d9a52277df06d656564b28e456adabbee52e8c10 (patch) | |
tree | b4ffb2c8dbb3ecef708220826548850c68434f3b /make/calcdep.pl | |
parent | abbf70b2a35edaf17631e43027828011296924ad (diff) |
Remove support for static modules.
This has been frequently broken in the past and as far as I know is
used by literally nobody.
Also, even if all modules are compiled into the core any libraries
linked against are and have always been linked dynamically making
this unusable on platforms without dynamic libraries.
Diffstat (limited to 'make/calcdep.pl')
-rwxr-xr-x | make/calcdep.pl | 55 |
1 files changed, 3 insertions, 52 deletions
diff --git a/make/calcdep.pl b/make/calcdep.pl index f3ed04725..5dc0f6878 100755 --- a/make/calcdep.pl +++ b/make/calcdep.pl @@ -59,11 +59,7 @@ sub run() { open MAKE, '>real.mk' or die "Could not write real.mk: $!"; chdir "${\SOURCEPATH}/src"; - if ($ENV{INSPIRCD_STATIC}) { - run_static(); - } else { - run_dynamic(); - } + run_dynamic(); close MAKE; } @@ -133,56 +129,11 @@ modules: $mods END } -sub run_static() { - print MAKE <<END; -# DO NOT EDIT THIS FILE -# It is autogenerated by make/calcdep.pl, and will be overwritten -# every time you rerun make in the main directory -VPATH = \$(SOURCEPATH)/src - -bad-target: - \@echo "This Makefile must be run by a sub-make from the source" - \@echo "in order to set the correct environment variables" - \@exit 1 - -all: inspircd - -END - my(@deps, @srcs); - for my $file (<*.cpp>, <socketengines/*.cpp>, <coremods/*.cpp>, <coremods/core_*/*.cpp>, - <modules/*.cpp>, <modules/m_*/*.cpp>, "threadengines/threadengine_pthread.cpp") { - my $out = find_output $file, 1; - if ($out =~ m#obj/([^/]+)/[^/]+.o$#) { - mkdir "${\BUILDPATH}/obj/$1"; - } - dep_cpp $file, $out, 'gen-o'; - next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp"; - push @deps, $out; - push @srcs, $file; - } - - my $core_mk = join ' ', @deps; - my $core_src = join ' ', @srcs; - print MAKE <<END; - -obj/ld-extra.cmd: $core_src - \@\$(SOURCEPATH)/make/unit-cc.pl gen-ld \$\@ \$^ \$> - -bin/inspircd: $core_mk obj/ld-extra.cmd - \@\$(SOURCEPATH)/make/unit-cc.pl static-ld \$\@ \$^ \$> - -inspircd: bin/inspircd - -.PHONY: all bad-target inspircd - -END -} - sub find_output { - my($file, $static) = @_; + my $file = shift; my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file"; if ($path eq 'modules/' || $path eq 'coremods/') { - return $static ? "obj/$base.o" : "modules/$base.so"; + return "modules/$base.so"; } elsif ($path eq '' || $path eq 'modes/' || $path =~ /^[a-z]+engines\/$/) { return "obj/$base.o"; } elsif ($path =~ m#modules/(m_.*)/# || $path =~ m#coremods/(core_.*)/#) { |