diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | src/ortho/llvm-nodebug/Makefile | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index a65200553..786ee5a17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: dist: precise env: - BLD=llvm-3.8 - - CXX=clang++-3.8 + - CLANGXX=clang++-3.8 addons: apt: sources: diff --git a/Makefile.in b/Makefile.in index 5c21fb0bb..461ec0a58 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,6 +16,7 @@ # Software Foundation, 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. CC=@CC@ +CLANGXX=clang++ build=@build@ srcdir=@srcdir@ GNATMAKE=@GNATMAKE@ @@ -225,11 +226,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=$(CXX) \ + $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) --LINK=$(CLANGXX) \ `$(LLVM_CONFIG) --ldflags --libs --system-libs` $(LDFLAGS) llvm-cbindings.o: $(srcdir)/src/ortho/$(llvm_be)/llvm-cbindings.cpp - $(CXX) -c `$(LLVM_CONFIG) --includedir --cxxflags` \ + $(CLANGXX) -c `$(LLVM_CONFIG) --includedir --cxxflags` \ $(OPT_FLAGS) -o $@ $< libs.vhdl.llvmjit: ghdl_llvm_jit$(EXEEXT) @@ -246,14 +247,16 @@ 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)" llvm_be_ver="$(llvm_be_ver)" all + LLVM_CONFIG="$(LLVM_CONFIG)" CLANGXX="$(CLANGXX)" \ + llvm_be_ver="$(llvm_be_ver)" all oread-llvm$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/$(llvm_be)/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ GNATMAKE="$(GNATMAKE)" \ GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" \ - LLVM_CONFIG="$(LLVM_CONFIG)" llvm_be_ver="$(llvm_be_ver)" + LLVM_CONFIG="$(LLVM_CONFIG)" CLANGXX="$(CLANGXX)" \ + llvm_be_ver="$(llvm_be_ver)" install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT) $(INSTALL_PROGRAM) ghdl_llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT) diff --git a/src/ortho/llvm-nodebug/Makefile b/src/ortho/llvm-nodebug/Makefile index 3f9ab2099..41cc56b79 100644 --- a/src/ortho/llvm-nodebug/Makefile +++ b/src/ortho/llvm-nodebug/Makefile @@ -1,6 +1,6 @@ ortho_srcdir=.. GNAT_FLAGS=-gnaty3befhkmr -gnata -gnatf -gnatwael -gnat05 -CXX=clang++ +CLANGXX=clang++ LLVM_CONFIG=llvm-config GNATMAKE=gnatmake SED=sed @@ -11,11 +11,11 @@ all: $(ortho_exec) $(ortho_exec): $(ortho_srcdir)/llvm-nodebug/ortho_llvm.ads force llvm-cbindings.o ortho_code_main.adb $(GNATMAKE) -o $@ -aI$(ortho_srcdir)/llvm-nodebug -aI$(ortho_srcdir) \ $(GNAT_FLAGS) ortho_code_main -bargs -E \ - -largs llvm-cbindings.o --LINK=$(CXX) \ + -largs llvm-cbindings.o --LINK=$(CLANGXX) \ `$(LLVM_CONFIG) --ldflags --libs --system-libs` $(LDFLAGS) llvm-cbindings.o: $(ortho_srcdir)/llvm-nodebug/llvm-cbindings.cpp - $(CXX) -c `$(LLVM_CONFIG) --cxxflags` -o $@ $< + $(CLANGXX) -c `$(LLVM_CONFIG) --cxxflags` -o $@ $< ortho_code_main.adb: echo "with Ortho_Code_Main$(llvm_be_ver);" > ortho_code_main.tmp |