diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/bsd-real.mk | 2 | ||||
| -rwxr-xr-x | make/calcdep.pl | 2 | ||||
| -rw-r--r-- | make/gnu-real.mk | 2 | ||||
| -rwxr-xr-x | make/unit-cc.pl | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/make/bsd-real.mk b/make/bsd-real.mk index f12efd2b8..6fdf2e57f 100644 --- a/make/bsd-real.mk +++ b/make/bsd-real.mk @@ -16,7 +16,7 @@ commands: $(CMD_TARGS) modules: $(MOD_TARGS) $(MDIR_TARGS) inspircd: $(CORE_TARGS) - $(RUNCC) $(FLAGS) $(CORE_FLAGS) -o inspircd $(LDLIBS) $(CORE_TARGS) + $(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $(CORE_TARGS) .for FILE in $(DFILES) .include "$(FILE)" diff --git a/make/calcdep.pl b/make/calcdep.pl index 8d85e6463..06610c416 100755 --- a/make/calcdep.pl +++ b/make/calcdep.pl @@ -52,7 +52,7 @@ for my $file (@ARGV) { my $ofiles = join ' ', grep s#(.*)\.cpp$#$path$base/$1.o#, readdir DIR; closedir DIR; open OUT, '>', $cmd; - print OUT "$out: $ofiles\n\t".'$(RUNCC) $(FLAGS) $(PICLDFLAGS) -o $@ ' + print OUT "$out: $ofiles\n\t".'$(RUNCC) $(PICLDFLAGS) -o $@ ' .$ofiles."\n"; print OUT "$cmd: $file\n\t".'@../make/calcdep.pl '."$path$base\n"; } else { diff --git a/make/gnu-real.mk b/make/gnu-real.mk index 28c5afa60..79fc2cd9e 100644 --- a/make/gnu-real.mk +++ b/make/gnu-real.mk @@ -19,7 +19,7 @@ commands: $(CMD_TARGS) modules: $(MOD_TARGS) inspircd: $(CORE_TARGS) - $(RUNCC) $(FLAGS) $(CORE_FLAGS) -o $@ $(LDLIBS) $(CORE_TARGS) + $(RUNCC) -o $@ $(CORELDFLAGS) $(LDLIBS) $(CORE_TARGS) .%.d: %.cpp @../make/calcdep.pl $< diff --git a/make/unit-cc.pl b/make/unit-cc.pl index 5110037ac..3a40457f2 100755 --- a/make/unit-cc.pl +++ b/make/unit-cc.pl @@ -15,7 +15,8 @@ if ($file =~ /^-/) { my $out = shift; -my $cflags = nopedantic($file) ? $ENV{NICEFLAGS} : $ENV{FLAGS}; +my $cflags = $ENV{CXXFLAGS}; +$cflags =~ s/ -pedantic// if nopedantic($file); $cflags .= ' ' . getcompilerflags($file); my $flags; |