summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2014-10-21 09:37:50 +0100
committerPeter Powell <petpow@saberuk.com>2014-10-24 23:34:41 +0100
commitd04979df092f93e2e0031b0d866afff418994e05 (patch)
treefdd241fe4f02db3c9d21882bdde2297f184b5ec1 /make
parentcb45d5c3a51eb0e2c625809ee28c618faeb4da78 (diff)
Fix some small bugs in the makefile template.
- GCC in C++ mode should be called g++ not gcc. - ICC in C++ mode should be called icpc not icc.
Diffstat (limited to 'make')
-rw-r--r--make/template/main.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/make/template/main.mk b/make/template/main.mk
index e55e36c0a..f88a80e3a 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -50,7 +50,7 @@ INSTMODE_DIR = 0755
INSTMODE_BIN = 0755
INSTMODE_LIB = 0644
-@IFEQ $(CC) icc
+@IFEQ $(CC) icpc
CXXFLAGS += -Wshadow
@ELSE
CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
@@ -91,7 +91,7 @@ INSTMODE_LIB = 0644
DBGOK=0
@IFEQ $(D) 0
CXXFLAGS += -O2
-@IFEQ $(CC) gcc
+@IFEQ $(CC) g++
CXXFLAGS += -g1
@ENDIF
HEADER = std-header