riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:cliffordwolf/yosys

This commit is contained in:
Clifford Wolf 2016-08-26 23:36:15 +02:00
parent 1276c87a56 3356d3947b
commit 7500b403de
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -72,7 +72,7 @@ else
LDLIBS += -lrt LDLIBS += -lrt
endif endif
YOSYS_VER := 0.6+$(shell test -d .git && { git log --author=clifford@clifford.at --oneline 5869d26da021.. | wc -l; }) YOSYS_VER := 0.6+$(shell test -e .git && { git log --author=clifford@clifford.at --oneline 5869d26da021.. | wc -l; })
GIT_REV := $(shell cd $(YOSYS_SRC) && git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN) GIT_REV := $(shell cd $(YOSYS_SRC) && git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN)
OBJS = kernel/version_$(GIT_REV).o OBJS = kernel/version_$(GIT_REV).o
@ -84,6 +84,7 @@ OBJS = kernel/version_$(GIT_REV).o
# delete your work on ABC.. # delete your work on ABC..
ABCREV = a86455b00da5 ABCREV = a86455b00da5
ABCPULL = 1 ABCPULL = 1
ABCURL ?= https://bitbucket.org/alanmi/abc
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"
# set ABCEXTERNAL = <abc-command> to use an external ABC instance # set ABCEXTERNAL = <abc-command> to use an external ABC instance
@ -387,8 +388,8 @@ ifneq ($(ABCREV),default)
fi fi
$(Q) if test "`cd abc 2> /dev/null && hg identify | cut -f1 -d' '`" != "$(ABCREV)"; then \ $(Q) if test "`cd abc 2> /dev/null && hg identify | cut -f1 -d' '`" != "$(ABCREV)"; then \
test $(ABCPULL) -ne 0 || { echo 'REEBE: NOP abg hc gb qngr naq NOPCHYY frg gb 0 va Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; exit 1; }; \ test $(ABCPULL) -ne 0 || { echo 'REEBE: NOP abg hc gb qngr naq NOPCHYY frg gb 0 va Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; exit 1; }; \
echo "Pulling ABC from bitbucket.org:"; set -x; \ echo "Pulling ABC from $(ABCURL):"; set -x; \
test -d abc || hg clone https://bitbucket.org/alanmi/abc abc; \ test -d abc || hg clone $(ABCURL) abc; \
cd abc && $(MAKE) DEP= clean && hg pull && hg update -r $(ABCREV); \ cd abc && $(MAKE) DEP= clean && hg pull && hg update -r $(ABCREV); \
fi fi
endif endif