X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Funit-cc.pl;h=f4fa5a650a6fddfc513fe8348d6c679062d5da45;hb=0a329440bd1d0fa642ce2f3e14bc88125377b5bd;hp=311c4c2607fa922520efae5fe2d4a85ef30d01e7;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/unit-cc.pl b/make/unit-cc.pl index 311c4c260..f4fa5a650 100755 --- a/make/unit-cc.pl +++ b/make/unit-cc.pl @@ -1,8 +1,11 @@ #!/usr/bin/env perl - # # InspIRCd -- Internet Relay Chat Daemon # +# Copyright (C) 2019 iwalkalone +# Copyright (C) 2014 Attila Molnar +# Copyright (C) 2013, 2015-2016, 2018, 2021 Sadie Powell +# Copyright (C) 2012 Robby # Copyright (C) 2009-2010 Daniel De Graaf # # This file is part of InspIRCd. InspIRCd is free software: you can @@ -19,16 +22,15 @@ # -BEGIN { - push @INC, $ENV{SOURCEPATH}; - require 5.10.0; -} - +use v5.10.0; use strict; use warnings FATAL => qw(all); +use File::Basename qw(dirname); use File::Spec::Functions qw(abs2rel); +use FindBin qw($RealDir); +use lib dirname $RealDir; use make::console; use make::directive; @@ -55,9 +57,9 @@ exit 1; sub message($$$) { my ($type, $file, $command) = @_; if ($ENV{INSPIRCD_VERBOSE}) { - print "$command\n"; + say $command; } else { - print_format "\t<|GREEN $type:|>\t\t$file\n"; + say console_format "\t<|GREEN $type:|>\t\t$file"; } } @@ -78,7 +80,7 @@ sub do_link_dir { for my $file (<$dir/*.cpp>) { $link_flags .= rpath(get_directive($file, 'LinkerFlags', '')) . ' '; } - my $execstr = "$ENV{CXX} -o $out $ENV{PICLDFLAGS} $link_flags @_"; + my $execstr = "$ENV{CXX} -o $out $ENV{PICLDFLAGS} @_ $link_flags"; message 'LINK', $out, $execstr; exec $execstr; }