summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-10-25 01:16:02 +0200
committerAttila Molnar <attilamolnar@hush.com>2014-10-25 01:16:02 +0200
commit0035820e13a915a3bf1a440fcedf8ce25fe37a22 (patch)
tree30eac358bb60f252f33023c2a91ca34f30b8a945 /make
parent6cc3e6be818f8d15c41e32787ba6885d501e8ed4 (diff)
parent92e84bea6186b8d5ef44cee18b75d0bb633afb8e (diff)
Merge pull request #940 from SaberUK/insp20+fix-makefile
[2.0] Fix some small bugs in the makefile template.
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