Auto-detect TCL version
authorClifford Wolf <clifford@clifford.at>
Thu, 5 Feb 2015 22:39:26 +0000 (23:39 +0100)
committerClifford Wolf <clifford@clifford.at>
Thu, 5 Feb 2015 22:39:26 +0000 (23:39 +0100)
Makefile
README

index 1ca7f2fbd068481c669363a40c6091dcdd14bd2d..da174497ff07f2ac5681534df90057329ef09d9a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ LDLIBS += $(shell pkg-config --silence-errors --libs libffi || echo -lffi) -ldl
 endif
 
 ifeq ($(ENABLE_TCL),1)
-TCL_VERSION ?= tcl8.5
+TCL_VERSION ?= tcl$(shell echo 'puts [info tclversion]' | tclsh)
 TCL_INCLUDE ?= /usr/include/$(TCL_VERSION)
 CXXFLAGS += -I$(TCL_INCLUDE) -DYOSYS_ENABLE_TCL
 LDLIBS += -l$(TCL_VERSION)
diff --git a/README b/README
index fbd92db363fc3a794a5496644e8603dd7c378849..4ef43093867f829187d1df1d6b3b3dee34c16f7f 100644 (file)
--- a/README
+++ b/README
@@ -56,7 +56,7 @@ For example on Ubuntu Linux 14.04 LTS the following commands will install all
 prerequisites for building yosys:
 
        $ yosys_deps="build-essential clang bison flex libreadline-dev gawk
-              tcl8.5-dev libffi-dev git mercurial graphviz xdot pkg-config"
+              tcl-dev libffi-dev git mercurial graphviz xdot pkg-config"
        $ sudo apt-get install $yosys_deps
 
 There are also pre-compiled Yosys binary packages for Ubuntu and Win32 as well