use CXX instead of g++

5 files changed, 22 insertions, 23 deletions

diff --git a/test/Makefile b/test/Makefile
index 2b9bd1a..ce7bb2f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -56,12 +56,11 @@ noexception: noexception.cpp ../xbyak/xbyak.h
 test_nm: normalize_prefix $(TARGET)
 	$(MAKE) -C ../gen
 ifneq ($(ONLY_64BIT),1)
-	./test_nm.sh
-	./test_nm.sh noexcept
-	./noexception
-	./test_nm.sh Y
-	./test_nm.sh avx512
-	./test_address.sh
+	env CXX=$(CXX) ./test_nm.sh
+	env CXX=$(CXX) ./test_nm.sh noexcept
+	env CXX=$(CXX) ./test_nm.sh Y
+	env CXX=$(CXX) ./test_nm.sh avx512
+	env CXX=$(CXX) ./test_address.sh
 	./jmp
 	./cvt_test32
 endif
@@ -70,32 +69,32 @@ endif
 	./misc32
 	./cvt_test
 ifeq ($(BIT),64)
-	./test_address.sh 64
+	env CXX=$(CXX) ./test_address.sh 64
 ifneq ($(X32),1)
-	./test_nm.sh 64
-	./test_nm.sh Y64
+	env CXX=$(CXX) ./test_nm.sh 64
+	env CXX=$(CXX) ./test_nm.sh Y64
 endif
 	./jmp64
 endif
 
 test_avx: normalize_prefix
 ifneq ($(ONLY_64BIT),0)
-	./test_avx.sh
-	./test_avx.sh Y
+	env CXX=$(CXX) ./test_avx.sh
+	env CXX=$(CXX) ./test_avx.sh Y
 endif
 ifeq ($(BIT),64)
-	./test_avx.sh 64
+	env CXX=$(CXX) ./test_avx.sh 64
 ifneq ($(X32),1)
-	./test_avx.sh Y64
+	env CXX=$(CXX) ./test_avx.sh Y64
 endif
 endif
 
 test_avx512: normalize_prefix
 ifneq ($(ONLY_64BIT),0)
-	./test_avx512.sh
+	env CXX=$(CXX) ./test_avx512.sh
 endif
 ifeq ($(BIT),64)
-	./test_avx512.sh 64
+	env CXX=$(CXX) ./test_avx512.sh 64
 endif
 
 detect_x32: detect_x32.c
diff --git a/test/test_address.sh b/test/test_address.sh
index d283a5f..413a2dd 100755
--- a/test/test_address.sh
+++ b/test/test_address.sh
@@ -7,7 +7,7 @@ sub()
 
 CFLAGS="-Wall -fno-operator-names -I../ $OPT2"
 echo "compile address.cpp"
-g++ $CFLAGS address.cpp -o address
+$CXX $CFLAGS address.cpp -o address
 
 ./address $1 > a.asm
 echo "asm"
@@ -17,7 +17,7 @@ awk '{printf "%s", sub(/-$/, "", $3) ? $3 : $3 ORS}' a.lst | $FILTER > ok.lst
 echo "xbyak"
 ./address $1 jit > nm.cpp
 echo "compile nm_frame.cpp"
-g++ $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame
+$CXX $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame
 ./nm_frame > x.lst
 diff ok.lst x.lst && echo "ok"
 
diff --git a/test/test_avx.sh b/test/test_avx.sh
index 34dc1e5..e949111 100755
--- a/test/test_avx.sh
+++ b/test/test_avx.sh
@@ -33,7 +33,7 @@ esac
 
 CFLAGS="-Wall -fno-operator-names -I../ $OPT2 -DUSE_AVX"
 echo "compile make_nm.cpp"
-g++ $CFLAGS make_nm.cpp -o make_nm
+$CXX $CFLAGS make_nm.cpp -o make_nm
 
 ./make_nm > a.asm
 echo "asm"
@@ -43,6 +43,6 @@ awk '$3 != "1+1" {printf "%s", sub(/-$/, "", $3) ? $3 : $3 ORS}' a.lst | $FILTER
 echo "xbyak"
 ./make_nm jit > nm.cpp
 echo "compile nm_frame.cpp"
-g++ $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame
+$CXX $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame
 ./nm_frame | $FILTER > x.lst
 diff -B ok.lst x.lst && echo "ok"
diff --git a/test/test_avx512.sh b/test/test_avx512.sh
index 17edfee..e110d64 100755
--- a/test/test_avx512.sh
+++ b/test/test_avx512.sh
@@ -20,7 +20,7 @@ esac
 
 CFLAGS="-Wall -fno-operator-names -I../ $OPT2 -DUSE_AVX512"
 echo "compile make_512.cpp"
-g++ $CFLAGS make_512.cpp -o make_512
+$CXX $CFLAGS make_512.cpp -o make_512
 
 ./make_512 > a.asm
 echo "asm"
@@ -30,6 +30,6 @@ awk '{printf "%s", sub(/-$/, "", $3) ? $3 : $3 ORS}' a.lst | $FILTER > ok.lst
 echo "xbyak"
 ./make_512 jit > nm.cpp
 echo "compile nm_frame.cpp"
-g++ $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame -DXBYAK_AVX512
+$CXX $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame -DXBYAK_AVX512
 ./nm_frame | $FILTER > x.lst
 diff -B ok.lst x.lst && echo "ok"
diff --git a/test/test_nm.sh b/test/test_nm.sh
index afa2b1e..06f80fb 100755
--- a/test/test_nm.sh
+++ b/test/test_nm.sh
@@ -46,7 +46,7 @@ esac
 
 CFLAGS="-Wall -fno-operator-names -I../ $OPT2"
 echo "compile make_nm.cpp with $CFLAGS"
-g++ $CFLAGS make_nm.cpp -o make_nm
+$CXX $CFLAGS make_nm.cpp -o make_nm
 
 ./make_nm > a.asm
 echo "asm"
@@ -56,6 +56,6 @@ awk '$3 != "1+1" {printf "%s", sub(/-$/, "", $3) ? $3 : $3 ORS}' a.lst | $FILTER
 echo "xbyak"
 ./make_nm jit > nm.cpp
 echo "compile nm_frame.cpp"
-g++ $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame
+$CXX $CFLAGS -DXBYAK_TEST nm_frame.cpp -o nm_frame
 ./nm_frame | $FILTER > x.lst
 diff -B ok.lst x.lst && echo "ok"