diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-08-26 23:36:15 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-08-26 23:36:15 +0200 |
| commit | 7500b403de9eeafcc3de2a8eba051a03d5f5f10e (patch) | |
| tree | 0f150fd3f32ee890b8fd9a16266ef1f4e03780ea | |
| parent | 1276c87a56f6f6d1a134877f024d2af785354570 (diff) | |
| parent | 3356d3947bc8cd343019587f5fc33b8ca27afdb3 (diff) | |
| download | yosys-7500b403de9eeafcc3de2a8eba051a03d5f5f10e.tar.gz yosys-7500b403de9eeafcc3de2a8eba051a03d5f5f10e.tar.bz2 yosys-7500b403de9eeafcc3de2a8eba051a03d5f5f10e.zip | |
Merge branch 'master' of github.com:cliffordwolf/yosys
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -72,7 +72,7 @@ else LDLIBS += -lrt 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) OBJS = kernel/version_$(GIT_REV).o @@ -84,6 +84,7 @@ OBJS = kernel/version_$(GIT_REV).o # delete your work on ABC.. ABCREV = a86455b00da5 ABCPULL = 1 +ABCURL ?= https://bitbucket.org/alanmi/abc ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" # set ABCEXTERNAL = <abc-command> to use an external ABC instance @@ -387,8 +388,8 @@ ifneq ($(ABCREV),default) fi $(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; }; \ - echo "Pulling ABC from bitbucket.org:"; set -x; \ - test -d abc || hg clone https://bitbucket.org/alanmi/abc abc; \ + echo "Pulling ABC from $(ABCURL):"; set -x; \ + test -d abc || hg clone $(ABCURL) abc; \ cd abc && $(MAKE) DEP= clean && hg pull && hg update -r $(ABCREV); \ fi endif |