diff options
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | make/template/main.mk | 5 |
2 files changed, 5 insertions, 3 deletions
@@ -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 |