diff options
| author | Iris Johnson <ijohnson@fnal.gov> | 2022-04-07 20:07:44 -0500 |
|---|---|---|
| committer | Iris Johnson <ijohnson@fnal.gov> | 2022-04-07 20:07:44 -0500 |
| commit | ccc6060f52236ef772e0997450128f2a2e295cb3 (patch) | |
| tree | 2ac89ddc5616540ca5af2ead69c3c5fbd21d8006 | |
| parent | e0ba324236eac33cf914dfce2b8377a23fb798a6 (diff) | |
| download | yosys-ccc6060f52236ef772e0997450128f2a2e295cb3.tar.gz yosys-ccc6060f52236ef772e0997450128f2a2e295cb3.tar.bz2 yosys-ccc6060f52236ef772e0997450128f2a2e295cb3.zip | |
Makefile: properly conditionalize features requiring compression.
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | passes/sat/Makefile.inc | 2 |
2 files changed, 12 insertions, 1 deletions
@@ -594,11 +594,15 @@ $(eval $(call add_include_file,kernel/satgen.h)) $(eval $(call add_include_file,kernel/qcsat.h)) $(eval $(call add_include_file,kernel/ff.h)) $(eval $(call add_include_file,kernel/ffinit.h)) +ifeq ($(ENABLE_ZLIB),1) $(eval $(call add_include_file,kernel/fstdata.h)) +endif $(eval $(call add_include_file,kernel/mem.h)) $(eval $(call add_include_file,libs/ezsat/ezsat.h)) $(eval $(call add_include_file,libs/ezsat/ezminisat.h)) +ifeq ($(ENABLE_ZLIB),1) $(eval $(call add_include_file,libs/fst/fstapi.h)) +endif $(eval $(call add_include_file,libs/sha1/sha1.h)) $(eval $(call add_include_file,libs/json11/json11.hpp)) $(eval $(call add_include_file,passes/fsm/fsmdata.h)) @@ -620,7 +624,10 @@ ifneq ($(ABCEXTERNAL),) kernel/yosys.o: CXXFLAGS += -DABCEXTERNAL='"$(ABCEXTERNAL)"' endif endif -OBJS += kernel/cellaigs.o kernel/celledges.o kernel/satgen.o kernel/qcsat.o kernel/mem.o kernel/ffmerge.o kernel/ff.o kernel/fstdata.o +OBJS += kernel/cellaigs.o kernel/celledges.o kernel/satgen.o kernel/qcsat.o kernel/mem.o kernel/ffmerge.o kernel/ff.o +ifeq ($(ENABLE_ZLIB),1) +OBJS += kernel/fstdata.o +endif kernel/log.o: CXXFLAGS += -DYOSYS_SRC='"$(YOSYS_SRC)"' kernel/yosys.o: CXXFLAGS += -DYOSYS_DATDIR='"$(DATDIR)"' -DYOSYS_PROGRAM_PREFIX='"$(PROGRAM_PREFIX)"' @@ -644,9 +651,11 @@ OBJS += libs/minisat/SimpSolver.o OBJS += libs/minisat/Solver.o OBJS += libs/minisat/System.o +ifeq ($(ENABLE_ZLIB),1) OBJS += libs/fst/fstapi.o OBJS += libs/fst/fastlz.o OBJS += libs/fst/lz4.o +endif include $(YOSYS_SRC)/frontends/*/Makefile.inc include $(YOSYS_SRC)/passes/*/Makefile.inc diff --git a/passes/sat/Makefile.inc b/passes/sat/Makefile.inc index 7118c1563..da6d49433 100644 --- a/passes/sat/Makefile.inc +++ b/passes/sat/Makefile.inc @@ -2,7 +2,9 @@ OBJS += passes/sat/sat.o OBJS += passes/sat/freduce.o OBJS += passes/sat/eval.o +ifeq ($(ENABLE_ZLIB),1) OBJS += passes/sat/sim.o +endif OBJS += passes/sat/miter.o OBJS += passes/sat/expose.o OBJS += passes/sat/assertpmux.o |