--- a/configure.ac
+++ b/configure.ac
@@ -341,14 +341,6 @@
 	GMAKE="make"
 fi
 
-GPP=`which clang++`
-if test x$GPP = x
-then
-	GPP="g++"
-else
-	GPP="$GPP -O0"
-fi
-
 GIT=`which git`
 if test x$GIT = x
 then
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,6 @@
 SHELL=/bin/sh
 OS := $(shell uname -s)
 PWD=@PWD@
-GPP=@GPP@
 INSTALL_DIR=$(DESTDIR)$(prefix)
 MAN_DIR=$(DESTDIR)@MAN_DIR@
 
@@ -126,12 +125,12 @@
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 %.o: %.cpp $(HEADERS) Makefile
-	$(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
 
 .PRECIOUS: $(TARGET) $(OBJECTS)
 
 $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile
-	$(GPP) $(OBJECTS) -Wall $(LIBS) -o $@
+	$(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@
 
 $(LUAJIT_LIB):
 	cd $(LUAJIT_HOME); @GMAKE@