summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-19 03:08:57 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-19 03:08:57 +0000
commit5adcd45748d040770e2eabd7799f88c046c4afc5 (patch)
tree15fdb235b6ad5f71e0c5ce5e95cd2a3c23a2a819
parent46db2cbb68615e8626aa9f47e9fe9be104b961cf (diff)
What openbsd muppet decided to rename gcc3?!
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1448 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--.Makefile.inc2
-rwxr-xr-xconfigure5
2 files changed, 6 insertions, 1 deletions
diff --git a/.Makefile.inc b/.Makefile.inc
index 383d97e5e..4db8dea9f 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -7,7 +7,7 @@
# Small modifications by <brain@ChatSpike.net>
#
-CC = g++
+CC = @CC@
MAKE = @MAKEPROG@
PROGS = inspircd
FLAGS = @FLAGS@
diff --git a/configure b/configure
index 6153eb110..7b51640f7 100755
--- a/configure
+++ b/configure
@@ -33,6 +33,7 @@ chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`); # FD Limit
chomp($config{GCCVER} = `gcc -dumpversion | cut -c 1`); # Major GCC Version
chomp($config{GCC34} = `gcc -dumpversion | cut -c 3`); # Minor GCC Version
chomp($config{OSNAME} = `/bin/uname`); # Operating System Name
+$config{CC} = `g++`; # C++ compiler
if ((!$config{OSNAME}) || ($config{OSNAME} eq "")) {
chomp($config{OSNAME} = `/usr/bin/uname`);
@@ -287,6 +288,7 @@ print "\033[0mMax channel length:\033[1;32m\t\t$config{CHAN_LENGT}\n";
print "\033[0mMax mode length:\033[1;32m\t\t$config{MAXI_MODES}\n";
print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.$config{GCC34}\n";
print "\033[0mOptimatizaton Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n\n";
+print "\033[0mCompiler program:\033[1;32m\t\t$config{CC}\033[0m\n\n";
makecache();
writefiles();
@@ -381,6 +383,9 @@ sub getosflags {
$config{LDLIBS} = "-Ldl";
$config{FLAGS} = "-fPIC -frtti $OPTIMISATI -Woverloaded-virtual $config{OPTIMISATI}";
$config{MAKEPROG} = "gmake";
+ if ($config{OSNAME} eq "OpenBSD") {
+ $config{CC} = "eg++";
+ }
} else {
$config{LDLIBS} = "-ldl";
$config{FLAGS} = "-fPIC -frtti $OPTIMISATI -Woverloaded-virtual $config{OPTIMISATI}";