From 67bdbb81a09da1ccd3ab60bba5f7091477a46071 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Fri, 19 Jun 2020 05:31:52 +0200
Subject: Makefile.in: force -gnat12, pass CFLAGS to llvm Makefile.

---
 Makefile.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 733d7539e..fd22b2bbf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,7 +81,7 @@ ifeq "$(build_mode)" "coverage"
 OPT_FLAGS+=-fprofile-arcs -ftest-coverage
 endif
 
-GNATFLAGS=-gnaty3befhkmr -gnatwa -gnatwC -gnatf $(OPT_FLAGS) $(ADA_FLAGS)
+GNATFLAGS=-gnat12 -gnaty3befhkmr -gnatwa -gnatwC -gnatf $(OPT_FLAGS) $(ADA_FLAGS)
 GRT_FLAGS=$(OPT_FLAGS)
 
 ifeq "$(default_pic)" "true"
@@ -350,8 +350,9 @@ ghdl1-llvm$(EXEEXT): version.ads force
 	$(MAKE) -f $(srcdir)/src/ortho/$(llvm_be)/Makefile \
 	 ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \
 	 GNATFLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	 LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" GNATMAKE="$(GNATMAKE)" \
-	 all
+	 LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" \
+	 CFLAGS="$(WARN_FLAGS) $(OPT_FLAGS)" \
+	 GNATMAKE="$(GNATMAKE)" all
 
 oread-llvm$(EXEEXT): force
 	$(MAKE) -f $(srcdir)/src/ortho/$(llvm_be)/Makefile \
-- 
cgit v1.2.3