diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-07-04 19:42:15 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2013-07-05 07:12:02 +0100 |
| commit | 1b475afbe5e033a55795271cdf98108dac3e97a7 (patch) | |
| tree | 44ea99905d12ae86a65edfb29efcb6ffe4a96101 /make | |
| parent | 90a068af714dac058fba97e1b413dc8c0dbd5bcf (diff) | |
Expose compiler name to make.
- Convert ICC detection to use new variable.
Diffstat (limited to 'make')
| -rw-r--r-- | make/template/main.mk | 5 |
1 files changed, 3 insertions, 2 deletions
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 |