diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-08-26 23:36:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 23:36:05 +0200 |
| commit | 3356d3947bc8cd343019587f5fc33b8ca27afdb3 (patch) | |
| tree | cdeab448f8070688120a02c34eae65b731e29dcb | |
| parent | 17233b11e185d2c863ccd06830e8cd0d2be38e83 (diff) | |
| parent | ee620c6a24a62725f6f41b43728fe7ce4112e130 (diff) | |
| download | yosys-3356d3947bc8cd343019587f5fc33b8ca27afdb3.tar.gz yosys-3356d3947bc8cd343019587f5fc33b8ca27afdb3.tar.bz2 yosys-3356d3947bc8cd343019587f5fc33b8ca27afdb3.zip | |
Merge pull request #215 from frznchckn/to_upstream
Add some useful flexibility to build process
| -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 |