From 9a4304c42d9c6f544ecd07bf8166d96d0ea472d3 Mon Sep 17 00:00:00 2001
From: weidai <weidai11@users.noreply.github.com>
Date: Wed, 22 Oct 2003 21:08:07 +0000
Subject: [PATCH] use CXX instead of gcc directly

---
 GNUmakefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 6534afb9..bbdfb2bf 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -10,9 +10,14 @@ ARFLAGS = -cr	# ar needs the dash on OpenBSD
 RANLIB = ranlib
 UNAME = $(shell uname)
 ISX86 = $(shell uname -m | grep -c "i.86\|x86_64")
-GCC33ORLATER = $(shell gcc -v 2>&1 | grep -c "gcc version \(3.[3-9]\|[4-9]\)")
 ISMINGW = $(shell uname | grep -c "MINGW32")
 
+ifeq ($(CXX),gcc)	# for some reason CXX is gcc on cygwin 1.1.4
+CXX = g++
+endif
+
+GCC33ORLATER = $(shell $(CXX) -v 2>&1 | grep -c "gcc version \(3.[3-9]\|[4-9]\)")
+
 ifeq ($(ISX86) $(GCC33ORLATER) $(ISMINGW),1 1 0)	# MINGW32 is missing the memalign function
 CXXFLAGS += -msse2
 endif
@@ -31,7 +36,7 @@ ifeq ($(UNAME),Darwin)
 AR = libtool
 ARFLAGS = -static -o
 CXXFLAGS += -D__pic__
-IS_GCC2 = $(shell c++ -v 2>&1 | grep -c gcc-932)
+IS_GCC2 = $(shell $(CXX) -v 2>&1 | grep -c gcc-932)
 ifeq ($(IS_GCC2),1)
 CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables
 CXX = c++
@@ -44,10 +49,6 @@ ifeq ($(UNAME),SunOS)
 LDLIBS += -lnsl -lsocket
 endif
 
-ifeq ($(CXX),gcc)	# for some reason CXX is gcc on cygwin 1.1.4
-CXX = g++
-endif
-
 SRCS = $(wildcard *.cpp)
 ifeq ($(SRCS),)				# workaround wildcard function bug in GNU Make 3.77
 SRCS = $(shell ls *.cpp)