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.
---
 make/template/main.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'make/template')

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