diff options
| author | Tristan Gingold <tgingold@free.fr> | 2018-09-14 03:02:10 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2018-09-15 04:14:22 +0200 |
| commit | 22e5cd34c564bbc838a9765f6acd22ce73a47d93 (patch) | |
| tree | a6e3b9f26a8d61db3b2099ff51af1033bbc47774 /Makefile.in | |
| parent | e8ffea0c97583b564770e3ace87fa9641983ef64 (diff) | |
| download | ghdl-22e5cd34c564bbc838a9765f6acd22ce73a47d93.tar.gz ghdl-22e5cd34c564bbc838a9765f6acd22ce73a47d93.tar.bz2 ghdl-22e5cd34c564bbc838a9765f6acd22ce73a47d93.zip | |
Remove -gnat05, always use GNATFLAGS.
Fix #651
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 7e119a05c..e76a61f26 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,7 +79,7 @@ ifeq "$(build_mode)" "coverage" OPT_FLAGS+=-fprofile-arcs -ftest-coverage endif -GNATFLAGS=-gnaty3befhkmr -gnatwa -gnatf -gnat05 $(OPT_FLAGS) $(ADA_FLAGS) +GNATFLAGS=-gnaty3befhkmr -gnatwa -gnatf $(OPT_FLAGS) $(ADA_FLAGS) GRT_FLAGS=$(OPT_FLAGS) WARN_CFLAGS=-Wall @@ -184,7 +184,7 @@ install.mcode: install.mcode.program install.vhdllib install.vpi oread-mcode$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/mcode/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ - GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all + GNATFLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all #################### For gcc backend ############################## @@ -251,7 +251,7 @@ GHDL_GCC_INCFLAGS=$(GHDL_COMMON_INCFLAGS) ghdl1-gcc$(EXEEXT): version.ads force $(MAKE) -f $(srcdir)/src/ortho/gcc/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ - GNAT_FLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" all + GNATFLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" all ghdl_gcc$(EXEEXT): version.ads force $(GNATMAKE) $(GHDL_GCC_INCFLAGS) -aI$(srcdir)/src/ghdldrv \ @@ -263,13 +263,13 @@ libs.vhdl.local_gcc: ghdl_gcc$(EXEEXT) ghdl1-gcc$(EXEEXT) ghdl1-debug$(EXEEXT): version.ads force $(MAKE) -f $(srcdir)/src/ortho/debug/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ - GNAT_FLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" \ + GNATFLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" \ GNATMAKE="$(GNATMAKE)" all oread-gcc$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/gcc/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ - GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all + GNATFLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all #################### For llvm backend ############################## @@ -304,7 +304,7 @@ ghdl_llvm$(EXEEXT): version.ads force 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)" \ + GNATFLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" LDFLAGS="$(LDFLAGS)" \ LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" GNATMAKE="$(GNATMAKE)" \ all @@ -312,7 +312,7 @@ 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)" \ + GNATFLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" \ LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT) @@ -344,7 +344,7 @@ LIBGHDL_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/vhdl/python -aI$(srcdi libghdl_name=libghdl-$(libghdl_version)$(SOEXT) $(libghdl_name): $(GRT_SRC_DEPS) version.ads force - $(GNATMAKE) -I- -aI. -D pic -z libghdl -o $@ $(GNATFLAGS) $(PIC_FLAGS) -gnat05 $(LIBGHDL_INCFLAGS) -bargs -shared -Llibghdl_ -largs -shared $(SHLIB_FLAGS) + $(GNATMAKE) -I- -aI. -D pic -z libghdl -o $@ $(GNATFLAGS) $(PIC_FLAGS) $(LIBGHDL_INCFLAGS) -bargs -shared -Llibghdl_ -largs -shared $(SHLIB_FLAGS) all.libghdl.true: $(libghdl_name) all.libghdl.false: |