diff options
| author | Tristan Gingold <tgingold@free.fr> | 2017-10-19 20:53:05 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2017-10-19 20:53:05 +0200 |
| commit | f5b14c31ab8c9c42e6c51f08cdb5789a0f677eb7 (patch) | |
| tree | 50c511d1820e26c8ae5fcb3eee782b5ab742bc82 | |
| parent | ae229644603a6837ed38e0580abd9e2a80d26906 (diff) | |
| download | ghdl-f5b14c31ab8c9c42e6c51f08cdb5789a0f677eb7.tar.gz ghdl-f5b14c31ab8c9c42e6c51f08cdb5789a0f677eb7.tar.bz2 ghdl-f5b14c31ab8c9c42e6c51f08cdb5789a0f677eb7.zip | |
Makefiles: use GNATMAKE for llvm and grt.
Tentative fix for #443.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | src/grt/Makefile.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 40ffbc523..13fe15476 100644 --- a/Makefile.in +++ b/Makefile.in @@ -299,7 +299,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)" CXX="$(CXX)" \ + LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" GNATMAKE="$(GNATMAKE)" \ all oread-llvm$(EXEEXT): force diff --git a/src/grt/Makefile.inc b/src/grt/Makefile.inc index bf6f9dbf0..48acc1423 100644 --- a/src/grt/Makefile.inc +++ b/src/grt/Makefile.inc @@ -117,7 +117,7 @@ grt/run-bind.adb: grt $(GRT_SRC_DEPS) grt-force # Set No Run-Time flag to suppress references to standard gnat library. sed -e '/^P /s/P /P NR /' < grt/ghdl_main.ali > grt/ghdl_main-tmp.ali $(MV) grt/ghdl_main-tmp.ali grt/ghdl_main.ali - cd grt; gnatbind -Lgrt_ -o run-bind.adb -n ghdl_main.ali + cd grt; $(GNATMAKE) -b ghdl_main.ali -bargs -Lgrt_ -o run-bind.adb -n grt: mkdir grt |