diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-03-28 16:54:23 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-03-28 16:54:23 +0200 |
| commit | 95784437ac237be981d0cf573386ba22f28f9624 (patch) | |
| tree | aed692400d63ca87fe4541f2286e3cba56795da9 | |
| parent | 2ec832ddced03aff3fb5cef53ae935f39d32547c (diff) | |
| parent | 963c0d2525c9d7af9a2c7640b554923f3a4f647e (diff) | |
| download | yosys-95784437ac237be981d0cf573386ba22f28f9624.tar.gz yosys-95784437ac237be981d0cf573386ba22f28f9624.tar.bz2 yosys-95784437ac237be981d0cf573386ba22f28f9624.zip | |
Merge pull request #137 from ravenexp/master
Embed DATDIR make variable value into yosys binary.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | kernel/yosys.cc | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -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"); } |