diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-10-25 01:16:02 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-10-25 01:16:02 +0200 |
| commit | 0035820e13a915a3bf1a440fcedf8ce25fe37a22 (patch) | |
| tree | 30eac358bb60f252f33023c2a91ca34f30b8a945 | |
| parent | 6cc3e6be818f8d15c41e32787ba6885d501e8ed4 (diff) | |
| parent | 92e84bea6186b8d5ef44cee18b75d0bb633afb8e (diff) | |
Merge pull request #940 from SaberUK/insp20+fix-makefile
[2.0] Fix some small bugs in the makefile template.
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | make/template/main.mk | 4 |
2 files changed, 9 insertions, 7 deletions
@@ -260,6 +260,11 @@ if ($config{OSNAME} =~ /darwin/i) $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. $config{CC} = "xcrun clang++"; # C++ compiler for OSX. } +elsif ($config{OSNAME} =~ /freebsd/i) +{ + chomp(my $fbsd_version = `uname -r`); + $config{CC} = $fbsd_version ge '10.0' ? 'clang++' : 'g++'; +} else { $config{CC} = "g++"; # C++ compiler @@ -281,11 +286,8 @@ 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 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"; - } + print "`$config{CC}` was not found! A C++ compiler is required to build InspIRCd!\n"; + print "You can pass a custom compiler to $0 using --with-cc=[name].\n"; exit; } diff --git a/make/template/main.mk b/make/template/main.mk index e55e36c0a..f88a80e3a 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -50,7 +50,7 @@ INSTMODE_DIR = 0755 INSTMODE_BIN = 0755 INSTMODE_LIB = 0644 -@IFEQ $(CC) icc +@IFEQ $(CC) icpc CXXFLAGS += -Wshadow @ELSE CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall @@ -91,7 +91,7 @@ INSTMODE_LIB = 0644 DBGOK=0 @IFEQ $(D) 0 CXXFLAGS += -O2 -@IFEQ $(CC) gcc +@IFEQ $(CC) g++ CXXFLAGS += -g1 @ENDIF HEADER = std-header |