aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2017-05-30 07:46:44 +0200
committerTristan Gingold <tgingold@free.fr>2017-05-30 07:46:44 +0200
commit4886d93410e2bf3197b4091b5aad36882b093759 (patch)
tree58837afe6e7458ee64c6d856ad1db3c50f93eb3a
parent72978a3fcc94d31d9561695f8ab695c07a404d4f (diff)
downloadghdl-4886d93410e2bf3197b4091b5aad36882b093759.tar.gz
ghdl-4886d93410e2bf3197b4091b5aad36882b093759.tar.bz2
ghdl-4886d93410e2bf3197b4091b5aad36882b093759.zip
Define GHDL_GCC_BIN in Makefile.in
Fix #127
-rw-r--r--Makefile.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 4b1cde06d..cc2f4000d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -221,8 +221,13 @@ copy-sources.gcc: version.ads
$(CP) -p $(srcdir)/dist/gcc/lang-options.h $(gcc_vhdl_dir)
$(CP) -p $(srcdir)/dist/gcc/lang-specs.h $(gcc_vhdl_dir)
+# To build vhdl libs using a non-installed ghdl, define GHDL_GCC_BIN to the
+# path of ghdl and GHDL1_GCC_BIN to path of ghdl1
+GHDL_GCC_BIN=$(bindir)/ghdl$(EXEEXT)
+GHDL1_GCC_BIN= # --GHDL1=/path/to/ghdl1
+
libs.vhdl.gcc:
- $(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(bindir)/ghdl$(EXEEXT) GHDL_FLAGS="$(LIB_CFLAGS)" vhdl.libs.all libs.vhdl.standard
+ $(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL="$(GHDL_GCC_BIN)" GHDL_FLAGS="$(GHDL1_GCC_BIN) $(LIB_CFLAGS)" vhdl.libs.all libs.vhdl.standard
ghdllib: libs.vhdl.gcc $(libdirsuffix)/libgrt.a