From 23a879632df599ca18a0e122af48b82dc2d54d15 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Sat, 24 Dec 2016 15:45:04 +0100 Subject: Use CXX in makefiles and configures to design the c++ compiler. --- src/ortho/llvm-nodebug/Makefile | 8 ++++---- src/ortho/llvm/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ortho') 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 $@ $< -- cgit v1.2.3