summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2013-07-04 08:41:33 +0100
committerPeter Powell <petpow@saberuk.com>2013-07-05 07:12:02 +0100
commit2677d12f20f2921b9724dc198f5e232fa9217d6a (patch)
tree9417d217535b45acbcc7f9b7b57a9895a86ca3af
parentf52123b1ed0b1bd96db2282f04f0e5852a50d782 (diff)
Automatically detect the compiler which the user has installed.
-rwxr-xr-xconfigure24
-rw-r--r--make/configure.pm12
2 files changed, 18 insertions, 18 deletions
diff --git a/configure b/configure
index 0b3f293c0..777c6c323 100755
--- a/configure
+++ b/configure
@@ -232,16 +232,15 @@ $config{DESTINATION} = "BASE"; # Is target path.
if ($config{OSNAME} =~ /darwin/i)
{
$config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX.
- $config{CC} = "xcrun clang++"; # C++ compiler for OSX.
}
-else
-{
- $config{CC} = "g++"; # C++ compiler
-}
-if (defined $ENV{CXX})
-{
- $config{CC} = $ENV{CXX};
+
+$config{CC} = defined $ENV{CXX} && !system("$ENV{CXX} -v > /dev/null 2>&1") ? $ENV{CXX} : find_compiler();
+if ($config{CC} eq "") {
+ print "A C++ compiler could not be detected on your system!\n";
+ print "Set the CXX environment variable to the full path if this is incorrect.\n";
+ exit 1;
}
+
our $exec = $config{CC} . " -dumpversion | cut -c 1";
chomp($config{GCCVER} = `$exec`); # Major GCC Version
$exec = $config{CC} . " -dumpversion | cut -c 3";
@@ -253,15 +252,6 @@ if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
$config{HAS_OPENSSL} = "";
}
-if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) {
- if ($config{OSNAME} eq 'darwin') {
- 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";
- }
- exit;
-}
-
# Get and Set some important vars..
getmodules();
diff --git a/make/configure.pm b/make/configure.pm
index 194d439e3..c022a7493 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -31,10 +31,20 @@ use warnings FATAL => qw(all);
use Exporter 'import';
use POSIX;
use make::utilities;
-our @EXPORT = qw(test_file test_header promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s module_installed);
+our @EXPORT = qw(find_compiler test_file test_header promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s module_installed);
my $no_git = 0;
+sub find_compiler {
+ foreach my $compiler ('c++', 'g++', 'clang++', 'icpc') {
+ return $compiler unless system "$compiler -v > /dev/null 2>&1";
+ if ($^O eq 'Darwin') {
+ return $compiler unless system "xcrun $compiler -v > /dev/null 2>&1";
+ }
+ }
+ return "";
+}
+
sub test_file($$;$) {
my ($cc, $file, $args) = @_;
my $status = 0;