From cb91529bd1809f25e666c7a2ad0afb16e60f1066 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 4 Sep 2014 17:09:53 -0700 Subject: [PATCH] Use CXX for the variable containing the name of the C++ compiler CXX is standard, CCPLUS is not used anywhere else. Change-Id: I2b98d609ade694306dd20062b8149a242ff7e91b Signed-off-by: Thiago Macieira --- csdk/arduinodue.properties | 2 +- csdk/arduinomega.properties | 2 +- csdk/libcoap-4.1.1/examples/makefile | 4 ++-- csdk/libcoap-4.1.1/makefile | 6 +++--- csdk/makefile | 2 +- csdk/ocsocket/test/android/makefile | 8 ++++---- csdk/ocsocket/test/arduino/makefile | 4 ++-- csdk/ocsocket/test/linux/makefile | 6 +++--- csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile | 2 +- .../stack/samples/arduino/SimpleClientServer/ocserver/makefiledue | 4 ++-- csdk/stack/test/arduino/makefile | 6 +++--- csdk/stack/test/linux/makefile | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/csdk/arduinodue.properties b/csdk/arduinodue.properties index 06a40b0..863a48b 100644 --- a/csdk/arduinodue.properties +++ b/csdk/arduinodue.properties @@ -33,7 +33,7 @@ CFLAGS_PLATFORM = -ffunction-sections -fdata-sections -nostdlib --param max-inli -DWITH_ARDUINO -DNDEBUG #Compilers -CCPLUS=$(ARDUINO_TOOLS_DIR)/arm-none-eabi-g++ +CXX=$(ARDUINO_TOOLS_DIR)/arm-none-eabi-g++ CC=$(ARDUINO_TOOLS_DIR)/arm-none-eabi-gcc AR=$(ARDUINO_TOOLS_DIR)/arm-none-eabi-ar RANLIB=$(ARDUINO_TOOLS_DIR)/arm-none-eabi-ranlib diff --git a/csdk/arduinomega.properties b/csdk/arduinomega.properties index 925c477..473b58a 100644 --- a/csdk/arduinomega.properties +++ b/csdk/arduinomega.properties @@ -28,7 +28,7 @@ CFLAGS_PLATFORM = -mmcu=atmega2560 -DF_CPU=16000000L -DARDUINO=156 -DARDUINO_AV -MMD -std=c++0x -Wno-write-strings -ffunction-sections -fdata-sections -fno-exceptions -felide-constructors -DATMEGA2560 -DNDEBUG #Compilers -CCPLUS=$(ARDUINO_TOOLS_DIR)/avr-g++ +CXX=$(ARDUINO_TOOLS_DIR)/avr-g++ CC=$(ARDUINO_TOOLS_DIR)/avr-gcc AR=$(ARDUINO_TOOLS_DIR)/avr-ar RANLIB=$(ARDUINO_TOOLS_DIR)/avr-ranlib diff --git a/csdk/libcoap-4.1.1/examples/makefile b/csdk/libcoap-4.1.1/examples/makefile index cb7383c..0d19887 100644 --- a/csdk/libcoap-4.1.1/examples/makefile +++ b/csdk/libcoap-4.1.1/examples/makefile @@ -31,14 +31,14 @@ OBJ_DIR = ./ INC_DIRS = -I.. -I$(OCSOCK_DIR)/include/ -I$(LOGGER_DIR)/include -I$(RANDOM_DIR)/include ifeq ($(PLATFORM),android) - CCPLUS=arm-linux-androideabi-g++ + CXX=arm-linux-androideabi-g++ CC=arm-linux-androideabi-gcc AR=arm-linux-androideabi-ar RANLIB=arm-linux-androideabi-ranlib CFLAGS_ANDROID = -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 LDFLAGS_ANDROID = -march=armv7-a -Wl,--fix-cortex-a8 -llog else ifeq ($(PLATFORM),linux) - CCPLUS=g++ + CXX=g++ CC=gcc AR=ar RANLIB=ranlib diff --git a/csdk/libcoap-4.1.1/makefile b/csdk/libcoap-4.1.1/makefile index 003de62..ac35199 100644 --- a/csdk/libcoap-4.1.1/makefile +++ b/csdk/libcoap-4.1.1/makefile @@ -41,14 +41,14 @@ INC_DIRS = -I$(OCSOCK_DIR)/include/ -I$(LOGGER_DIR)/include -I$(RANDOM_DIR)/incl # Note for Arduino: The CC flag is set to the C++ compiler since Arduino build # includes Time.h header file which has C++ style definitions. ifeq ($(PLATFORM),android) - CCPLUS=arm-linux-androideabi-g++ + CXX=arm-linux-androideabi-g++ CC=arm-linux-androideabi-gcc AR=arm-linux-androideabi-ar RANLIB=arm-linux-androideabi-ranlib CFLAGS_PLATFORM = -DWITH_POSIX -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 LDFLAGS_PLATFORM = -march=armv7-a -Wl,--fix-cortex-a8 -llog else ifeq ($(PLATFORM),linux) - CCPLUS=g++ + CXX=g++ CC=gcc AR=ar RANLIB=ranlib @@ -97,7 +97,7 @@ prep_dirs: $(CC) -c $(CC_FLAGS.$(BUILD)) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $(OBJ_DIR)/$@ %.o: %.cpp - $(CCPLUS) -c $(CC_FLAGS.$(BUILD)) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $(OBJ_DIR)/$@ + $(CXX) -c $(CC_FLAGS.$(BUILD)) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $(OBJ_DIR)/$@ libcoap.a: $(OBJECTS) $(OBJECTSCPP) $(AR) rcs $(OUT_DIR)/$@ $(addprefix $(OBJ_DIR)/,$^) diff --git a/csdk/makefile b/csdk/makefile index d5f9707..8818000 100644 --- a/csdk/makefile +++ b/csdk/makefile @@ -38,7 +38,7 @@ endif ifeq ($(PLATFORM),linux) - CCPLUS=g++ + CXX=g++ CC=gcc AR=ar RANLIB=ranlib diff --git a/csdk/ocsocket/test/android/makefile b/csdk/ocsocket/test/android/makefile index 8f1d7f6..f68574d 100644 --- a/csdk/ocsocket/test/android/makefile +++ b/csdk/ocsocket/test/android/makefile @@ -27,7 +27,7 @@ BIN_DIR = $(OCSOCK_DIR)/bin/android/ OBJ_DIR = $(OCSOCK_DIR)/obj/android/ INC_DIRS = -I$(OCSOCK_DIR)/include/ -I$(LOGGER_DIR)/include -CCPLUS=arm-linux-androideabi-g++ +CXX=arm-linux-androideabi-g++ CC=arm-linux-androideabi-gcc CFLAGS_ANDROID = -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -DGTEST_HAS_PTHREAD=0 LDFLAGS_ANDROID = -march=armv7-a -Wl,--fix-cortex-a8 -llog @@ -49,13 +49,13 @@ all: $(TEST_APP) cp *.o $(OBJ_DIR) %.o: %.c - $(CCPLUS) -c $(CFLAGS) $(CFLAGS_ANDROID) $(INC_DIRS) $< -o $@ + $(CXX) -c $(CFLAGS) $(CFLAGS_ANDROID) $(INC_DIRS) $< -o $@ $(TEST_APP).o: $(TEST_APP).cpp - $(CCPLUS) -c $(CFLAGS) $(CFLAGS_ANDROID) $(INC_DIRS) -I$(GTEST_ANDROID_DIR)/include -o $@ $< + $(CXX) -c $(CFLAGS) $(CFLAGS_ANDROID) $(INC_DIRS) -I$(GTEST_ANDROID_DIR)/include -o $@ $< $(TEST_APP): $(TEST_APP).o $(DEP_LIBS) $(COBJ) - $(CCPLUS) -Os -Wl,--gc-sections $(LDFLAGS_ANDROID) $^ -o $@ + $(CXX) -Os -Wl,--gc-sections $(LDFLAGS_ANDROID) $^ -o $@ install: all # adb remount diff --git a/csdk/ocsocket/test/arduino/makefile b/csdk/ocsocket/test/arduino/makefile index 507cbf6..682a5a8 100644 --- a/csdk/ocsocket/test/arduino/makefile +++ b/csdk/ocsocket/test/arduino/makefile @@ -58,13 +58,13 @@ core.a: $(PLATFORM_OBJS) #logger needs to be compiled using C++ compiler logger.o: logger.c - $(CCPLUS) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ + $(CXX) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ %.o: %.c $(CC) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ %.o: %.cpp - $(CCPLUS) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ + $(CXX) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ $(APP_NAME).elf: $(APP_NAME).o $(OCSOCKET_CPPOBJ) logger.o core.a $(CC) -Os -Wl,--gc-sections,--relax $(CFLAGS_PLATFORM) $^ -lm -o $@ diff --git a/csdk/ocsocket/test/linux/makefile b/csdk/ocsocket/test/linux/makefile index c3316a5..6cfd318 100644 --- a/csdk/ocsocket/test/linux/makefile +++ b/csdk/ocsocket/test/linux/makefile @@ -29,7 +29,7 @@ BIN_DIR = $(OCSOCK_DIR)/bin/linux/ OBJ_DIR = $(OCSOCK_DIR)/obj/linux/ INC_DIRS = -I$(OCSOCK_DIR)/include/ -I$(LOGGER_DIR)/include -CCPLUS = g++ +CXX = g++ CC = gcc CFLAGS += -Os -Wall -Wno-write-strings -ffunction-sections -fdata-sections -fno-exceptions -DTB_LOG @@ -49,10 +49,10 @@ all: $(TEST_APP) $(CC) -c $(CFLAGS) $(INC_DIRS) $< -o $@ $(TEST_APP).o: $(TEST_APP).cpp - $(CCPLUS) -c $(CFLAGS) -pthread $(INC_DIRS) -I$(GTEST_LINUX_DIR)/include -o $@ $< + $(CXX) -c $(CFLAGS) -pthread $(INC_DIRS) -I$(GTEST_LINUX_DIR)/include -o $@ $< $(TEST_APP): $(TEST_APP).o $(DEP_LIBS) $(COBJ) - $(CCPLUS) -Os -Wl,--gc-sections $^ -lpthread -o $@ + $(CXX) -Os -Wl,--gc-sections $^ -lpthread -o $@ .PHONY: clean diff --git a/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile b/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile index 7096902..5e134eb 100644 --- a/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile +++ b/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefile @@ -66,7 +66,7 @@ prep_dirs: $(CC) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ %.o: %.cpp - $(CCPLUS) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ + $(CXX) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ $(APP_NAME).elf: $(APP_NAME).o core.a $(CC) -Os -Wl,--gc-sections,--relax $(CFLAGS_PLATFORM) $^ -lm -o $@ diff --git a/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefiledue b/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefiledue index 59e12e9..b080258 100644 --- a/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefiledue +++ b/csdk/stack/samples/arduino/SimpleClientServer/ocserver/makefiledue @@ -37,11 +37,11 @@ prep_dirs: $(CC) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ %.o: %.cpp - $(CCPLUS) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ + $(CXX) $(CFLAGS) $(CFLAGS_PLATFORM) $(INC_DIRS) $(INC_DIR_PLATFORM) $< -o $@ $(APP_NAME).elf: $(APP_NAME).o core.a - $(CCPLUS) -Os -Wl,--gc-sections -mcpu=cortex-m3 -T/$(SDIR_ARD_CORE_3)/linker_scripts/gcc/flash.ld -Wl,-Map,$(APP_NAME).map -o $@ -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group $(APP_NAME).o $(SYSCALLS_SAM3_OBJ) $(SPI_OBJ) $(ETH_CPPOBJ) $(ETH_UTIL_CPPOBJ) $(VARIANT_OBJ) $(SDIR_ARD_CORE_3)/libsam_sam3x8e_gcc_rel.a core.a -Wl,--end-group + $(CXX) -Os -Wl,--gc-sections -mcpu=cortex-m3 -T/$(SDIR_ARD_CORE_3)/linker_scripts/gcc/flash.ld -Wl,-Map,$(APP_NAME).map -o $@ -lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group $(APP_NAME).o $(SYSCALLS_SAM3_OBJ) $(SPI_OBJ) $(ETH_CPPOBJ) $(ETH_UTIL_CPPOBJ) $(VARIANT_OBJ) $(SDIR_ARD_CORE_3)/libsam_sam3x8e_gcc_rel.a core.a -Wl,--end-group $(APP_NAME).bin: $(APP_NAME).elf $(ARDUINO_TOOLS_DIR)/arm-none-eabi-objcopy -O binary $< $@ diff --git a/csdk/stack/test/arduino/makefile b/csdk/stack/test/arduino/makefile index 4b6ff75..704413a 100644 --- a/csdk/stack/test/arduino/makefile +++ b/csdk/stack/test/arduino/makefile @@ -61,7 +61,7 @@ COPTIONS_ARDUINO = -mmcu=atmega2560 -DF_CPU=16000000L -DARDUINO=156 -DARDUINO_AV CFLAGS += -c -Os -Wall -Wno-write-strings -ffunction-sections -fdata-sections -fno-exceptions -felide-constructors -std=c++0x -DATMEGA2560 -DTB_LOG -DWITH_ARDUINO #Compilers -CCPLUS=avr-g++ +CXX=avr-g++ CC=avr-gcc AR=avr-ar RANLIB=avr-ranlib @@ -86,10 +86,10 @@ all: core.a $(TESTAPP).o $(TESTAPP).elf $(TESTAPP).hex # Note for Arduino: The C files are compiled using C++ compiler since Arduino # build includes Time.h header file which has C++ style definitions. %.o: %.c - $(CCPLUS) $(CFLAGS) $(COPTIONS_ARDUINO) $(INC_DIRS) $< -o $@ + $(CXX) $(CFLAGS) $(COPTIONS_ARDUINO) $(INC_DIRS) $< -o $@ %.o: %.cpp - $(CCPLUS) $(CFLAGS) $(COPTIONS_ARDUINO) $(INC_DIRS) $< -o $@ + $(CXX) $(CFLAGS) $(COPTIONS_ARDUINO) $(INC_DIRS) $< -o $@ core.a: $(CORE_COBJ) $(CORE_CPPOBJ) $(ETH_CPPOBJ) $(ETH_UTIL_CPPOBJ) $(LIBCOAP_DIR)/$(BUILD)/libcoap.a $(AR) rcs $@ $^ diff --git a/csdk/stack/test/linux/makefile b/csdk/stack/test/linux/makefile index 2113642..1ff017c 100644 --- a/csdk/stack/test/linux/makefile +++ b/csdk/stack/test/linux/makefile @@ -41,14 +41,14 @@ INC_DIRS += -I$(LOGGER_DIR)/include INC_DIRS += -I$(RANDOM_DIR)/include ifeq ($(PLATFORM),android) - CCPLUS=arm-linux-androideabi-g++ + CXX=arm-linux-androideabi-g++ CC=arm-linux-androideabi-gcc AR=arm-linux-androideabi-ar RANLIB=arm-linux-androideabi-ranlib CFLAGS_ANDROID = -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 LDFLAGS_ANDROID = -march=armv7-a -Wl,--fix-cortex-a8 -llog else ifeq ($(PLATFORM),linux) - CCPLUS=g++ + CXX=g++ CC=gcc AR=ar RANLIB=ranlib -- 2.7.4