diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2013-07-06 08:35:04 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2013-07-06 08:35:04 -0700 |
| commit | b64221d8ba35b461af9267537b3853728e4e02df (patch) | |
| tree | 50b48a1cd9720b0fa939a293d737dccb5d08b497 /make/template/main.mk | |
| parent | 752cb8b179cc1cbec3f36d7a3084fa98a81f92d8 (diff) | |
| parent | 1b475afbe5e033a55795271cdf98108dac3e97a7 (diff) | |
Merge pull request #578 from SaberUK/master+configure-compiler-detection
Improve compiler logic in configure.
Diffstat (limited to 'make/template/main.mk')
| -rw-r--r-- | make/template/main.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index fd094b578..b93c15094 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -30,12 +30,13 @@ # -CXX = @CC@ +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 |