diff options
| author | Jim Lawson <ucbjrl@berkeley.edu> | 2019-07-30 16:04:27 -0700 |
|---|---|---|
| committer | Jim Lawson <ucbjrl@berkeley.edu> | 2019-07-30 16:04:27 -0700 |
| commit | e8341d949f79e501abcf637edd3e7d409e2dd72c (patch) | |
| tree | 7a2f88af3d923113c2a02eaa23d663b474b21cd2 /Makefile | |
| parent | c66b7402c06455535bb43ee65fe20515b5b9c0ee (diff) | |
| parent | b4f38cca77a78884ce215190935af78cae92c4db (diff) | |
| download | yosys-e8341d949f79e501abcf637edd3e7d409e2dd72c.tar.gz yosys-e8341d949f79e501abcf637edd3e7d409e2dd72c.tar.bz2 yosys-e8341d949f79e501abcf637edd3e7d409e2dd72c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -19,6 +19,7 @@ ENABLE_VERIFIC := 0 ENABLE_COVER := 1 ENABLE_LIBYOSYS := 0 ENABLE_PROTOBUF := 0 +ENABLE_ZLIB := 1 # python wrappers ENABLE_PYOSYS := 0 @@ -122,7 +123,7 @@ OBJS = kernel/version_$(GIT_REV).o # is just a symlink to your actual ABC working directory, as 'make mrproper' # will remove the 'abc' directory and you do not want to accidentally # delete your work on ABC.. -ABCREV = 62487de +ABCREV = 5776ad0 ABCPULL = 1 ABCURL ?= https://github.com/berkeley-abc/abc ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 @@ -384,6 +385,12 @@ ifeq ($(ENABLE_GLOB),1) CXXFLAGS += -DYOSYS_ENABLE_GLOB endif +ifeq ($(ENABLE_ZLIB),1) +CXXFLAGS += -DYOSYS_ENABLE_ZLIB +LDLIBS += -lz +endif + + ifeq ($(ENABLE_TCL),1) TCL_VERSION ?= tcl$(shell bash -c "tclsh <(echo 'puts [info tclversion]')") ifeq ($(OS), FreeBSD) |