diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-09-19 15:08:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 15:08:31 +0200 |
| commit | dc77ed1e8801d9705d16d940c5b09ca2ea08c572 (patch) | |
| tree | 958e914ca5c8fb0f795099228a235d58a5fccac7 | |
| parent | f1972b6c9084d9eb5e13cd8d07702fba8a5fe7bb (diff) | |
| parent | c5e9034834ce0bcc6f6c611bc3ad3d244a32732f (diff) | |
| download | yosys-dc77ed1e8801d9705d16d940c5b09ca2ea08c572.tar.gz yosys-dc77ed1e8801d9705d16d940c5b09ca2ea08c572.tar.bz2 yosys-dc77ed1e8801d9705d16d940c5b09ca2ea08c572.zip | |
Merge pull request #633 from mmicko/master
Fix Cygwin build and document needed packages
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | kernel/yosys.cc | 2 |
3 files changed, 14 insertions, 1 deletions
@@ -175,6 +175,12 @@ LD = gcc-4.8 CXXFLAGS += -std=c++11 -Os ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H" +else ifeq ($(CONFIG),cygwin) +CXX = gcc +LD = gcc +CXXFLAGS += -std=gnu++11 -Os +ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H" + else ifeq ($(CONFIG),emcc) CXX = emcc LD = emcc @@ -729,6 +735,9 @@ config-msys2: clean config-msys2-64: clean echo 'CONFIG := msys2-64' > Makefile.conf +config-cygwin: clean + echo 'CONFIG := cygwin' > Makefile.conf + config-gcov: clean echo 'CONFIG := gcc' > Makefile.conf echo 'ENABLE_GCOV := 1' >> Makefile.conf @@ -69,6 +69,10 @@ On FreeBSD use the following command to install all prerequisites: On FreeBSD system use gmake instead of make. To run tests use: % MAKE=gmake CC=cc gmake test +For Cygwin use the following command to install all prerequisites, or select these additional packages: + + setup-x86_64.exe -q --packages=bison,flex,gcc-core,gcc-g++,git,libffi-devel,libreadline-devel,make,pkg-config,python3,tcl-devel + There are also pre-compiled Yosys binary packages for Ubuntu and Win32 as well as a source distribution for Visual Studio. Visit the Yosys download page for more information: http://www.clifford.at/yosys/download.html diff --git a/kernel/yosys.cc b/kernel/yosys.cc index 264b1f63d..ad032899c 100644 --- a/kernel/yosys.cc +++ b/kernel/yosys.cc @@ -166,7 +166,7 @@ std::string vstringf(const char *fmt, va_list ap) std::string string; char *str = NULL; -#ifdef _WIN32 +#if defined(_WIN32 )|| defined(__CYGWIN__) int sz = 64, rc; while (1) { va_list apc; |