From b0ca1c921f606671a13451c86e1faf0add848b4c Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 21 Mar 2012 17:02:24 +0000 Subject: Switch configure script to use clang on OS X as Apple no longer maintain their fork of GCC. --- configure | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 721505fcc..0b7700b2a 100755 --- a/configure +++ b/configure @@ -228,8 +228,12 @@ if ($config{OSNAME} =~ /darwin/i) { $config{IS_DARWIN} = "YES"; $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. + $config{CC} = "clang++"; # C++ compiler for OSX. +} +else +{ + $config{CC} = "g++"; # C++ compiler } -$config{CC} = "g++"; # C++ compiler if (defined $opt_cc) { $config{CC} = $opt_cc; @@ -247,7 +251,11 @@ if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) { } if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) { - print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n"; + if ($config{IS_DARWIN} eq "YES") { + print $config{CC} . " was not found! You require clang++ (the LLVN C++ compiler, part of the OSX developer tools) to build InspIRCd!\n"; + } else { + print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n"; + } exit; } -- cgit v1.2.3 From 2e266c880c92b995701b5c09b01ad66541d524c3 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 21 Mar 2012 19:22:11 +0000 Subject: Typo fixes. --- configure | 2 +- src/commands/cmd_clearcache.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 0b7700b2a..f354b62e1 100755 --- a/configure +++ b/configure @@ -252,7 +252,7 @@ if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) { if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) { if ($config{IS_DARWIN} eq "YES") { - print $config{CC} . " was not found! You require clang++ (the LLVN C++ compiler, part of the OSX developer tools) to build InspIRCd!\n"; + print $config{CC} . " was not found! You require clang++ (the LLVM C++ compiler, part of the OSX developer tools) to build InspIRCd!\n"; } else { print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n"; } diff --git a/src/commands/cmd_clearcache.cpp b/src/commands/cmd_clearcache.cpp index ecf2c07fc..c5492a8b6 100644 --- a/src/commands/cmd_clearcache.cpp +++ b/src/commands/cmd_clearcache.cpp @@ -17,7 +17,7 @@ #include "channels.h" #include "ctables.h" -/** Handle /ADMIN. These command handlers can be reloaded by the core, +/** Handle /CLEARCACHE. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work * the same way, however, they can be fully unloaded, where these * may not. -- cgit v1.2.3