test/Makefile: use CXX, instead of CC/LD for crosc compile

Author: k-okada

test/Makefile

@@ -1,4 +1,4 @@
-GCC_MACHINE=$(shell gcc -dumpmachine)
+GCC_MACHINE=$(shell $(CXX) -dumpmachine)
 $(info "-- GCC_MACHINE = ${GCC_MACHINE}")
 OS=$(shell uname -s | sed 's/[^A-Za-z1-9].*//')
 $(info "--      OS = ${OS}")
@@ -25,11 +25,11 @@ OBJ=$(basename $(SRC)).o
 LIB=$(basename $(SRC)).$(LSFX)
 
 $(LIB): $(OBJ)
-	$(LD) $(SOFLAGS) $(OUTOPT)$(LIB) $(OBJ) $(LDFLAGS)
+	$(CXX) $(SOFLAGS) $(OUTOPT)$(LIB) $(OBJ) $(LDFLAGS)
 	@echo "Try make test"
 
 $(OBJ): $(SRC)
-	$(CC) $(CFLAGS) -DCOMPILE_LIB -c $(SRC) $(OBJOPT)$(OBJ)
+	$(CXX) $(CFLAGS) -DCOMPILE_LIB -c $(SRC) $(OBJOPT)$(OBJ)
 
 clean:
 	rm -f $(LIB) $(OBJ)

test/Makefile.Cygwin

@@ -1,11 +1,9 @@
-CC = c++
+CXX ?= c++
 CFLAGS = -O2 -falign-functions=4 -DCygwin -I$(EUSDIR)/include
 LDFLAGS =
 OBJOPT = -o
 OUTOPT = -o
-LD = c++ -shared -falign-functions=4
-EXELD = c++ -falign-functions=4
-SOFLAGS =
+SOFLAGS = -shared -falign-functions=4
 EXESFX = .exe
 LSFX = dll
 LPFX = lib

test/Makefile.Darwin

@@ -1,11 +1,9 @@
-CC = c++
+CXX ?= c++
 CFLAGS = -O2 -falign-functions=8 -fPIC -DDarwin -DGCC -I$(EUSDIR)/include
 LDFLAGS =
 OBJOPT = -o
 OUTOPT = -o
-LD = c++
 SOFLAGS = -dynamiclib -flat_namespace -undefined suppress
-EXELD = c++
 EXESFX =
 LSFX = so
 LPFX = lib

test/Makefile.Linux

@@ -1,33 +1,29 @@
-CC = c++
+CXX ?= c++
 CFLAGS = -O2 -DLinux -DGCC -I$(EUSDIR)/include
 LDFLAGS =
 OBJOPT = -o
 OUTOPT = -o
-LD = c++
 SOFLAGS = -shared
-EXELD = c++
 EXESFX =
 LSFX = so
 LPFX = lib
 
-ifneq (,$(findstring 64,$(shell gcc -dumpmachine)))
+ifneq (,$(findstring 64,$(shell $(CXX) -dumpmachine)))
  CFLAGS+=-falign-functions=8
 else
  CFLAGS+=-falign-functions=4
 endif
 
-ifneq ($(shell gcc -dumpmachine | egrep "^(arm|aarch)"),)
+ifneq ($(shell $(CXX) -dumpmachine | egrep "^(arm|aarch)"),)
   LDFLAGS+=-Wl,-z,execstack
   CFLAGS+=-DARM -fPIC
 endif
-ifneq ($(shell gcc -dumpmachine | grep "^x86_64"),)
+ifneq ($(shell $(CXX) -dumpmachine | grep "^x86_64"),)
   CFLAGS+=-fPIC
 endif
 
-ifneq ($(shell gcc -dumpmachine | grep "i.*86-linux"),)
-CC += -m32
-LD += -m32
-EXELD += -m32
+ifneq ($(shell $(CXX) -dumpmachine | grep "i.*86-linux"),)
+CXX += -m32
 endif