From: Sergey Kvachonok <ravenexp@gmail.com>
Date: Sat, 26 Mar 2016 08:01:53 +0000 (+0300)
Subject: Embed DATDIR make variable value into yosys binary.
X-Git-Tag: yosys-0.7~286^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=963c0d2525c9d7af9a2c7640b554923f3a4f647e;p=yosys.git

Embed DATDIR make variable value into yosys binary.

Use it as the last resort in the share/ directory location search.
---

diff --git a/Makefile b/Makefile
index b1d94e16a..7f4e5c9b1 100644
--- a/Makefile
+++ b/Makefile
@@ -281,6 +281,7 @@ $(eval $(call add_include_file,backends/ilang/ilang_backend.h))
 
 OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys.o kernel/cellaigs.o
 kernel/log.o: CXXFLAGS += -DYOSYS_SRC='"$(YOSYS_SRC)"'
+kernel/yosys.o: CXXFLAGS += -DYOSYS_DATDIR='"$(DATDIR)"'
 
 OBJS += libs/bigint/BigIntegerAlgorithms.o libs/bigint/BigInteger.o libs/bigint/BigIntegerUtils.o
 OBJS += libs/bigint/BigUnsigned.o libs/bigint/BigUnsignedInABase.o
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index eba1aef11..a69a85447 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -701,6 +701,11 @@ std::string proc_share_dirname()
 	proc_share_path = proc_self_path + "../share/yosys/";
 	if (check_file_exists(proc_share_path, true))
 		return proc_share_path;
+#    ifdef YOSYS_DATDIR
+	proc_share_path = YOSYS_DATDIR "/";
+	if (check_file_exists(proc_share_path, true))
+		return proc_share_path;
+#    endif
 #  endif
 	log_error("proc_share_dirname: unable to determine share/ directory!\n");
 }