diff options
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rwxr-xr-x | dist/travis-ci.sh | 2 | ||||
| -rw-r--r-- | src/ortho/llvm-nodebug/Makefile | 8 | ||||
| -rw-r--r-- | src/ortho/llvm/Makefile | 2 |
5 files changed, 14 insertions, 13 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) @@ -5,6 +5,7 @@ backend=mcode CC=${CC:-gcc} +CXX=${CXX:-clang++} CFLAGS=${CFLAGS:--g} GNATMAKE=${GNATMAKE:-gnatmake} LDFLAGS= @@ -25,7 +26,7 @@ PIC_FLAGS=-fPIC show_help=no progname=$0 -subst_vars="CC GNATMAKE CFLAGS LDFLAGS build srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be llvm_be_ver backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie" +subst_vars="CC CXX GNATMAKE CFLAGS LDFLAGS build srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be llvm_be_ver backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie" # Find srcdir srcdir=`dirname $progname` @@ -62,7 +63,7 @@ check_version() for opt do optarg=`expr x"$opt" : 'x[^=]*=\(.*\)'` case "$opt" in - CC=*|CFLAGS=*|GNATMAKE=*|LDFLAGS=*) + CC=*|CFLAGS=*|GNATMAKE=*|LDFLAGS=*|CXX=*) optvar=`expr x"$opt" : 'x\([^=]*\)=.*'` eval $optvar=\"$optarg\" ;; diff --git a/dist/travis-ci.sh b/dist/travis-ci.sh index ce943c62e..327680576 100755 --- a/dist/travis-ci.sh +++ b/dist/travis-ci.sh @@ -27,7 +27,7 @@ case "$BLD" in llvm*) llvm_ver=`echo $BLD | sed -e 's/llvm//'` ../configure --prefix="$prefix" --with-llvm-config=llvm-config$llvm_ver - MAKEOPTS="CLANGXX=clang++$llvm_ver" + MAKEOPTS="CXX=clang++$llvm_ver" ;; *) diff --git a/src/ortho/llvm-nodebug/Makefile b/src/ortho/llvm-nodebug/Makefile index 41cc56b79..21374f46f 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 -CLANGXX=clang++ +CXX=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=$(CLANGXX) \ - `$(LLVM_CONFIG) --ldflags --libs --system-libs` $(LDFLAGS) + -largs llvm-cbindings.o --LINK=$(CXX) \ + $(LDFLAGS) `$(LLVM_CONFIG) --ldflags --libs --system-libs` llvm-cbindings.o: $(ortho_srcdir)/llvm-nodebug/llvm-cbindings.cpp - $(CLANGXX) -c `$(LLVM_CONFIG) --cxxflags` -o $@ $< + $(CXX) -c `$(LLVM_CONFIG) --cxxflags` -o $@ $< ortho_code_main.adb: echo "with Ortho_Code_Main$(llvm_be_ver);" > ortho_code_main.tmp diff --git a/src/ortho/llvm/Makefile b/src/ortho/llvm/Makefile index 3af94a6fe..8c6a8d7f2 100644 --- a/src/ortho/llvm/Makefile +++ b/src/ortho/llvm/Makefile @@ -12,7 +12,7 @@ $(ortho_exec): $(ortho_srcdir)/llvm/ortho_llvm.ads force llvm-cbindings.o $(GNATMAKE) -o $@ -aI$(ortho_srcdir)/llvm -aI$(ortho_srcdir) \ $(GNAT_FLAGS) ortho_code_main -bargs -E \ -largs llvm-cbindings.o --LINK=$(CXX) \ - `$(LLVM_CONFIG) --ldflags --libs --system-libs` $(LDFLAGS) + $(LDFLAGS) `$(LLVM_CONFIG) --ldflags --libs --system-libs` llvm-cbindings.o: $(ortho_srcdir)/llvm/llvm-cbindings.cpp $(CXX) -c `$(LLVM_CONFIG) --cxxflags` -o $@ $< |