diff options
| author | Tristan Gingold <tgingold@free.fr> | 2016-12-24 15:45:04 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2016-12-24 15:45:04 +0100 |
| commit | 23a879632df599ca18a0e122af48b82dc2d54d15 (patch) | |
| tree | 23a1e7bad0560e9f5d59658dc12754708111035b /Makefile.in | |
| parent | aa10e0e6a0c8e613b70abd17c7ec841d8108d942 (diff) | |
| download | ghdl-23a879632df599ca18a0e122af48b82dc2d54d15.tar.gz ghdl-23a879632df599ca18a0e122af48b82dc2d54d15.tar.bz2 ghdl-23a879632df599ca18a0e122af48b82dc2d54d15.zip | |
Use CXX in makefiles and configures to design the c++ compiler.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
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) |