summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorDaniel De Graaf <danieldg@inspircd.org>2010-05-07 13:39:49 -0500
committerDaniel De Graaf <danieldg@inspircd.org>2010-05-07 14:04:53 -0500
commitdf347edbdbb6d1d0f81795214674da8a4007850a (patch)
tree287ad3751d923ff14ea9a2506c2bcdfeee4332f2 /make
parente11ae4f39cbcd169e725b680015d73c127f4a70e (diff)
Use unit-cc for all compile and and link tasks
This allows splitting .o and .so generation for distcc builds, and also removes some unneeded autodetection of build stage.
Diffstat (limited to 'make')
-rwxr-xr-xmake/calcdep.pl45
-rw-r--r--make/template/main.mk6
-rwxr-xr-xmake/unit-cc.pl94
3 files changed, 93 insertions, 52 deletions
diff --git a/make/calcdep.pl b/make/calcdep.pl
index 2ae03cc36..45fdfc03c 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -5,7 +5,8 @@ use POSIX qw(getcwd);
sub find_output;
sub gendep($);
-sub dep_cpp($$);
+sub dep_cpp($$$);
+sub dep_so($);
sub dep_dir($);
sub run();
@@ -55,14 +56,13 @@ END
my(@core_deps, @cmdlist, @modlist);
for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
my $out = find_output $file;
- dep_cpp $file, $out;
+ dep_cpp $file, $out, 'gen-o';
next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
push @core_deps, $out;
}
for my $file (<commands/*.cpp>) {
- my $out = find_output $file;
- dep_cpp $file, $out;
+ my $out = dep_so $file;
push @cmdlist, $out;
}
@@ -80,8 +80,7 @@ END
push @modlist, "modules/$file.so";
}
if ($file =~ /^m_.*\.cpp$/) {
- my $out = find_output "modules/$file";
- dep_cpp "modules/$file", $out;
+ my $out = dep_so "modules/$file";
push @modlist, $out;
}
}
@@ -92,7 +91,7 @@ END
print MAKE <<END;
bin/inspircd: $core_mk
- \$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
+ @\$(SOURCEPATH)/make/unit-cc.pl core-ld\$(VERBOSE) \$\@ \$^ \$>
inspircd: bin/inspircd
@@ -127,7 +126,7 @@ END
if ($out =~ m#obj/([^/]+)/[^/]+.o$#) {
mkdir "$ENV{BUILDPATH}/obj/$1";
}
- dep_cpp $file, $out;
+ dep_cpp $file, $out, 'gen-o';
next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
push @deps, $out;
push @srcs, $file;
@@ -138,10 +137,10 @@ END
print MAKE <<END;
obj/ld-extra.cmd: $core_src
- \@\$(SOURCEPATH)/make/unit-cc.pl -f\$(VERBOSE) \$\@ \$^ \$>
+ \@\$(SOURCEPATH)/make/unit-cc.pl gen-ld\$(VERBOSE) \$\@ \$^ \$>
bin/inspircd: obj/ld-extra.cmd $core_mk
- \@\$(SOURCEPATH)/make/unit-cc.pl -l\$(VERBOSE) \$\@ \$^ \$>
+ \@\$(SOURCEPATH)/make/unit-cc.pl static-ld\$(VERBOSE) \$\@ \$^ \$>
inspircd: bin/inspircd
@@ -200,12 +199,27 @@ sub gendep($) {
$f2dep{$f};
}
-sub dep_cpp($$) {
- my($file, $out) = @_;
+sub dep_cpp($$$) {
+ my($file, $out, $type) = @_;
gendep $file;
print MAKE "$out: $file $f2dep{$file}\n";
- print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl \$(VERBOSE) \$\@ \$< \$>\n";
+ print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl $type\$(VERBOSE) \$\@ \$< \$>\n";
+}
+
+sub dep_so($) {
+ my($file) = @_;
+ my $out = find_output $file;
+ my $split = find_output $file, 1;
+
+ if ($ENV{SPLIT_CC}) {
+ dep_cpp $file, $split, 'gen-o';
+ print MAKE "$out: $split\n";
+ print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-so\$(VERBOSE) \$\@ \$< \$>\n";
+ } else {
+ dep_cpp $file, $out, 'gen-so';
+ }
+ return $out;
}
sub dep_dir($) {
@@ -215,13 +229,14 @@ sub dep_dir($) {
for my $file (sort readdir DIR) {
next unless $file =~ /(.*)\.cpp$/;
my $ofile = find_output "$dir/$file";
- dep_cpp "$dir/$file", $ofile;
+ dep_cpp "$dir/$file", $ofile, 'gen-o';
push @ofiles, $ofile;
}
closedir DIR;
if (@ofiles) {
my $ofiles = join ' ', @ofiles;
- print MAKE "$dir.so: $ofiles\n\t\$(RUNCC) \$(PICLDFLAGS) -o \$\@ \$^ \$>\n";
+ print MAKE "$dir.so: $ofiles\n";
+ print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-dir\$(VERBOSE) \$\@ \$^ \$>\n";
return 1;
} else {
return 0;
diff --git a/make/template/main.mk b/make/template/main.mk
index 0ee3c5f67..bb6bdc182 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -78,19 +78,21 @@ CXXFLAGS += -Iinclude
@IFDEF V
RUNCC = $(CC)
+ RUNLD = $(CC)
VERBOSE = -v
@ELSE
@GNU_ONLY MAKEFLAGS += --silent
@BSD_ONLY MAKE += -s
RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
+ RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
@ENDIF
@IFDEF PURE_STATIC
CXXFLAGS += -DPURE_STATIC
@ENDIF
-@DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS PURE_STATIC
-@DO_EXPORT SOURCEPATH BUILDPATH
+@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+@DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
# Default target
TARGET = all
diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index aefefa4ac..30b536343 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -6,43 +6,27 @@ use make::configure;
chdir $ENV{BUILDPATH};
+my $type = shift;
my $out = shift;
-my $verbose;
+my $verbose = ($type =~ s/-v$//);
-if ($out =~ /^-/) {
- $_ = $out;
- $out = shift;
- $verbose = /v/;
- if (/f/) {
- do_static_find(@ARGV);
- exit;
- }
- if (/l/) {
- do_static_link(@ARGV);
- exit;
- }
-}
-
-my $file = shift;
-
-my $cflags = $ENV{CXXFLAGS};
-$cflags =~ s/ -pedantic// if nopedantic($file);
-$cflags .= ' ' . getcompilerflags($file);
-
-if ($file =~ m#(?:^|/)((?:m|cmd)_[^/. ]+)(?:\.cpp|/.*\.cpp)$#) {
- $cflags .= ' -DMODNAME='.$1.'.so';
-}
-
-my $flags;
-if ($out =~ /\.so$/) {
- $flags = join ' ', $cflags, $ENV{PICLDFLAGS}, getlinkerflags($file);
+if ($type eq 'gen-ld') {
+ do_static_find(@ARGV);
+} elsif ($type eq 'static-ld') {
+ do_static_link(@ARGV);
+} elsif ($type eq 'core-ld') {
+ do_core_link(@ARGV);
+} elsif ($type eq 'link-dir') {
+ do_link_dir(@ARGV);
+} elsif ($type eq 'gen-o') {
+ do_compile(1, 0, @ARGV);
+} elsif ($type eq 'gen-so') {
+ do_compile(1, 1, @ARGV);
+} elsif ($type eq 'link-so') {
+ do_compile(0, 1, @ARGV);
} else {
- $flags = "$cflags -c";
+ print STDERR "Unknown unit-cc subcommand $type!\n";
}
-
-my $execstr = "$ENV{RUNCC} $flags -o $out $file";
-print "$execstr\n" if $verbose;
-exec $execstr;
exit 1;
sub do_static_find {
@@ -53,10 +37,11 @@ sub do_static_find {
open F, '>', $out;
print F join ' ', @flags;
close F;
+ exit 0;
}
sub do_static_link {
- my $execstr = "$ENV{RUNCC} -o $out $ENV{CORELDFLAGS} $ENV{LDLIBS}";
+ my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} $ENV{LDLIBS}";
for (@ARGV) {
if (/\.cmd$/) {
open F, '<', $_;
@@ -70,5 +55,44 @@ sub do_static_link {
}
print "$execstr\n" if $verbose;
exec $execstr;
- exit 1;
+}
+
+sub do_core_link {
+ my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} $ENV{LDLIBS} @_";
+ print "$execstr\n" if $verbose;
+ exec $execstr;
+}
+
+sub do_link_dir {
+ my $execstr = "$ENV{RUNLD} -o $out $ENV{PICLDFLAGS} @_";
+ print "$execstr\n" if $verbose;
+ exec $execstr;
+}
+
+sub do_compile {
+ my ($do_compile, $do_link, $file) = @_;
+
+ my $flags = '';
+ my $binary = $ENV{RUNCC};
+ if ($do_compile) {
+ $flags = $ENV{CXXFLAGS};
+ $flags =~ s/ -pedantic// if nopedantic($file);
+ $flags .= ' ' . getcompilerflags($file);
+
+ if ($file =~ m#(?:^|/)((?:m|cmd)_[^/. ]+)(?:\.cpp|/.*\.cpp)$#) {
+ $flags .= ' -DMODNAME='.$1.'.so';
+ }
+ } else {
+ $binary = $ENV{RUNLD};
+ }
+
+ if ($do_link) {
+ $flags = join ' ', $flags, $ENV{PICLDFLAGS}, getlinkerflags($file);
+ } else {
+ $flags .= ' -c';
+ }
+
+ my $execstr = "$binary -o $out $flags $file";
+ print "$execstr\n" if $verbose;
+ exec $execstr;
}