From ad925d641c4c9a1fa63f50666ee6b11e060097fe Mon Sep 17 00:00:00 2001
From: Stas Sergeev <stsp@users.sourceforge.net>
Date: Thu, 9 Sep 2021 01:26:53 +0300
Subject: [PATCH] make: override built-in CXX var [#182]

make sets CXX to gcc.
We can clear it by the simple assignment:
CXX=
That assignment is ignored if the var was set from cmd line.
Using -R seems to be no longer needed.
---
 fdpp/clang.mak | 3 +++
 makefile       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fdpp/clang.mak b/fdpp/clang.mak
index d09bef94..11354b9d 100644
--- a/fdpp/clang.mak
+++ b/fdpp/clang.mak
@@ -3,6 +3,9 @@
 #
 
 CC = clang++
+# Override builtin CXX.
+# The assignment below is ignored if CXX was set via cmd line.
+CXX=
 ifeq ($(CXX),)
 CL = clang++
 else
diff --git a/makefile b/makefile
index feac8f2c..f6b28d3e 100644
--- a/makefile
+++ b/makefile
@@ -6,7 +6,7 @@ define mdir
 	    mkdir $(1) 2>/dev/null ; \
 	    ln -s $(srcdir)/$(1)/makefile $(1)/makefile ; \
 	fi
-	cd $(1) && $(MAKE) -R srcdir=$(srcdir)/$(1) $(2)
+	cd $(1) && $(MAKE) srcdir=$(srcdir)/$(1) $(2)
 endef
 
 all: