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 /src/ortho | |
| 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 'src/ortho')
| -rw-r--r-- | src/ortho/llvm-nodebug/Makefile | 8 | ||||
| -rw-r--r-- | src/ortho/llvm/Makefile | 2 |
2 files changed, 5 insertions, 5 deletions
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 $@ $< |