summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authoraquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-24 20:30:17 +0000
committeraquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-24 20:30:17 +0000
commit82af95f1436cbf2a6dc7fde60a95d40ad88e1a38 (patch)
tree699eaa14acd14051abaf8cef722f76489a4c2f02 /make
parentea3a764bb870e0bab1fa6498564eb63b8ede72be (diff)
Make run-cc show ARCHIVE step(s), also get rid of 'entering/leaving directory' nonsense from gnumake.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9031 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'make')
-rwxr-xr-xmake/run-cc.pl49
1 files changed, 27 insertions, 22 deletions
diff --git a/make/run-cc.pl b/make/run-cc.pl
index b12466e2c..d4c976982 100755
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -82,33 +82,38 @@ my ($r_stderr, $w_stderr);
my $name = "";
my $action = "";
-foreach my $n (@ARGV)
-{
- if ($n =~ /\.cpp$/)
+if ($cc eq "ar") {
+ $name = $ARGV[1];
+ $action = "ARCHIVE";
+} else {
+ foreach my $n (@ARGV)
{
- if ($action eq "BUILD")
+ if ($n =~ /\.cpp$/)
+ {
+ if ($action eq "BUILD")
+ {
+ $name .= " " . $n;
+ }
+ else
+ {
+ $action = "BUILD";
+ $name = $n;
+ }
+ }
+ elsif ($action eq "BUILD") # .cpp has priority.
+ {
+ next;
+ }
+ elsif ($n eq "-o")
{
- $name .= " " . $n;
+ $action = $name = $n;
}
- else
+ elsif ($name eq "-o")
{
- $action = "BUILD";
+ $action = "LINK";
$name = $n;
}
}
- elsif ($action eq "BUILD") # .cpp has priority.
- {
- next;
- }
- elsif ($n eq "-o")
- {
- $action = $name = $n;
- }
- elsif ($name eq "-o")
- {
- $action = "LINK";
- $name = $n;
- }
}
if (!defined($cc) || $cc eq "") {
@@ -119,11 +124,11 @@ pipe($r_stderr, $w_stderr) or die "pipe stderr: $!\n";
$pid = fork;
-die "Cannot fork to start gcc! $!\n" unless defined($pid);
+die "Cannot fork to start $cc! $!\n" unless defined($pid);
if ($pid) {
- print "\t\e[1;32m$action:\e[0m\t\t$name\n" unless $name eq "";
+ printf "\t\e[1;32m%-20s\e[0m%s\n", $action . ":", $name unless $name eq "";
my $fail = 0;
# Parent - Close child-side pipes.