From 23a879632df599ca18a0e122af48b82dc2d54d15 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sat, 24 Dec 2016 15:45:04 +0100
Subject: Use CXX in makefiles and configures to design the c++ compiler.

---
 Makefile.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 27d2fc19d..4674d1625 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@
 #  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #  02111-1307, USA.
 CC=@CC@
-CLANGXX=clang++
+CXX=@CXX@
 build=@build@
 srcdir=@srcdir@
 GNATMAKE=@GNATMAKE@
@@ -227,11 +227,11 @@ ghdl_llvm_jit$(EXEEXT): $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) $(ORTHO_DEPS) \
                llvm-cbindings.o version.ads force
 	$(GNATMAKE) -o $@ $(GHDL_LLVM_INCFLAGS) $(GNATFLAGS) ghdl_jit.adb \
 	 $(GNAT_BARGS) -largs llvm-cbindings.o $(GNAT_LARGS) $(GRT_ADD_OBJS) \
-	 $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) --LINK=$(CLANGXX) \
+	 $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) --LINK=$(CXX) \
 	 `$(LLVM_CONFIG) --ldflags --libs --system-libs` $(LDFLAGS)
 
 llvm-cbindings.o: $(srcdir)/src/ortho/$(llvm_be)/llvm-cbindings.cpp
-	$(CLANGXX) -c `$(LLVM_CONFIG) --includedir --cxxflags` \
+	$(CXX) -c `$(LLVM_CONFIG) --includedir --cxxflags` \
 	  $(OPT_FLAGS) -o $@ $<
 
 libs.vhdl.llvmjit: ghdl_llvm_jit$(EXEEXT)
@@ -248,7 +248,7 @@ ghdl1-llvm$(EXEEXT): version.ads force
 	$(MAKE) -f $(srcdir)/src/ortho/$(llvm_be)/Makefile \
 	 ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
 	 GNAT_FLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	 LLVM_CONFIG="$(LLVM_CONFIG)" CLANGXX="$(CLANGXX)" \
+	 LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" \
 	 llvm_be_ver="$(llvm_be_ver)" all
 
 oread-llvm$(EXEEXT): force
@@ -256,7 +256,7 @@ oread-llvm$(EXEEXT): force
 	 ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
 	 GNATMAKE="$(GNATMAKE)" \
 	 GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" \
-	 LLVM_CONFIG="$(LLVM_CONFIG)" CLANGXX="$(CLANGXX)" \
+	 LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" \
 	 llvm_be_ver="$(llvm_be_ver)"
 
 install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT)
-- 
cgit v1.2.3