From 90a068af714dac058fba97e1b413dc8c0dbd5bcf Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Thu, 4 Jul 2013 18:46:46 +0100
Subject: Rename configuration variable to CXX to match everything else.

---
 make/template/main.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'make/template/main.mk')

diff --git a/make/template/main.mk b/make/template/main.mk
index fd094b578..5350e113e 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -30,7 +30,7 @@
 #
 
 
-CXX = @CC@
+CXX = @CXX@
 SYSTEM = @SYSTEM@
 BUILDPATH = @BUILD_DIR@
 SOCKETENGINE = @SOCKETENGINE@
-- 
cgit v1.2.3


From 1b475afbe5e033a55795271cdf98108dac3e97a7 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Thu, 4 Jul 2013 19:42:15 +0100
Subject: Expose compiler name to make.

- Convert ICC detection to use new variable.
---
 configure             | 3 ++-
 make/template/main.mk | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'make/template/main.mk')

diff --git a/configure b/configure
index d8d356bfb..32e8fc12d 100755
--- a/configure
+++ b/configure
@@ -882,9 +882,10 @@ EOF
 		close(FILEHANDLE);
 
 		$config{BUILD_DIR} ||= resolve_directory($config{ME}."/build");
+		$config{COMPILER} = lc $cxx{NAME};
 
 		for my $var (qw(
-			CXX SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
+			CXX COMPILER SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
 			STARTSCRIPT DESTINATION SOCKETENGINE
 		)) {
 			s/\@$var\@/$config{$var}/g;
diff --git a/make/template/main.mk b/make/template/main.mk
index 5350e113e..b93c15094 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -31,11 +31,12 @@
 
 
 CXX = @CXX@
+COMPILER = @COMPILER@
 SYSTEM = @SYSTEM@
 BUILDPATH = @BUILD_DIR@
 SOCKETENGINE = @SOCKETENGINE@
 CORECXXFLAGS = -fPIC -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow
-LDLIBS = -pthread -lstdc++
+LDLIBS = -lstdc++
 CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
 PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
 BASE = "$(DESTDIR)@BASE_DIR@"
@@ -49,7 +50,7 @@ INSTMODE_DIR = 0755
 INSTMODE_BIN = 0755
 INSTMODE_LIB = 0644
 
-@IFNEQ $(CXX) icc
+@IFNEQ $(COMPILER) icc
   CORECXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute
 @ENDIF
 
-- 
cgit v1.2.3