diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-06-14 04:13:27 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2013-07-04 17:51:33 +0100 |
| commit | 8aff5d15d3434fa11974d01d3319f958ed548e7c (patch) | |
| tree | da35e225d5dee5088c9c5ec89c883962031789b6 | |
| parent | 0b4a12dc5f1e4472cec1fc32773b399e1a93125a (diff) | |
Use CXX instead of CC.
CXX is the correct variable to use as CC is the C compiler.
| -rw-r--r-- | make/template/main.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index b24327e70..51ef01cff 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -30,7 +30,7 @@ # -CC = @CC@ +CXX = @CC@ SYSTEM = @SYSTEM@ BUILDPATH = @BUILD_DIR@ SOCKETENGINE = @SOCKETENGINE@ @@ -49,7 +49,7 @@ INSTMODE_DIR = 0755 INSTMODE_BIN = 0755 INSTMODE_LIB = 0644 -@IFNEQ $(CC) icc +@IFNEQ $(CXX) icc CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute @ENDIF @@ -83,7 +83,7 @@ INSTMODE_LIB = 0644 DBGOK=0 @IFEQ $(D) 0 CXXFLAGS += -O2 -@IFEQ $(CC) gcc +@IFEQ $(CXX) g++ CXXFLAGS += -g1 @ENDIF HEADER = std-header @@ -107,14 +107,14 @@ FOOTER = finishmessage @BSD_ONLY SOURCEPATH != /bin/pwd @IFDEF V - RUNCC = $(CC) - RUNLD = $(CC) + RUNCC = $(CXX) + RUNLD = $(CXX) VERBOSE = -v @ELSE @GNU_ONLY MAKEFLAGS += --silent @BSD_ONLY MAKE += -s - RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC) - RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CC) + RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CXX) + RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CXX) @ENDIF @IFDEF PURE_STATIC |