diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-03-11 01:08:36 -0700 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2019-03-11 01:08:36 -0700 |
| commit | d9bb5f3637634ea214194b612aee4bb0c62d7a5c (patch) | |
| tree | a31456d8153c13f3de1fa9da55c86b25da8be563 | |
| parent | ff4c2a14ae34eeb899c3cf0ca1109f0106b41679 (diff) | |
| download | yosys-d9bb5f3637634ea214194b612aee4bb0c62d7a5c.tar.gz yosys-d9bb5f3637634ea214194b612aee4bb0c62d7a5c.tar.bz2 yosys-d9bb5f3637634ea214194b612aee4bb0c62d7a5c.zip | |
Add ENABLE_GLOB Makefile switch
Signed-off-by: Clifford Wolf <clifford@clifford.at>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | kernel/yosys.cc | 8 |
2 files changed, 10 insertions, 3 deletions
@@ -10,6 +10,7 @@ CONFIG := clang # features (the more the better) ENABLE_TCL := 1 ENABLE_ABC := 1 +ENABLE_GLOB := 1 ENABLE_PLUGINS := 1 ENABLE_READLINE := 1 ENABLE_EDITLINE := 0 @@ -298,6 +299,10 @@ LDLIBS += -ldl endif endif +ifeq ($(ENABLE_GLOB),1) +CXXFLAGS += -DYOSYS_ENABLE_GLOB +endif + ifeq ($(ENABLE_TCL),1) TCL_VERSION ?= tcl$(shell bash -c "tclsh <(echo 'puts [info tclversion]')") ifeq ($(OS), FreeBSD) diff --git a/kernel/yosys.cc b/kernel/yosys.cc index 2ed0f4db4..6fd53f85e 100644 --- a/kernel/yosys.cc +++ b/kernel/yosys.cc @@ -33,7 +33,7 @@ # include <dlfcn.h> #endif -#ifdef _WIN32 +#if defined(_WIN32) # include <windows.h> # include <io.h> #elif defined(__APPLE__) @@ -41,13 +41,15 @@ # include <unistd.h> # include <dirent.h> # include <sys/stat.h> -# include <glob.h> #else # include <unistd.h> # include <dirent.h> # include <sys/types.h> # include <sys/wait.h> # include <sys/stat.h> +#endif + +#if !defined(_WIN32) && defined(YOSYS_ENABLE_GLOB) # include <glob.h> #endif @@ -564,7 +566,7 @@ std::vector<std::string> glob_filename(const std::string &filename_pattern) { std::vector<std::string> results; -#ifdef _WIN32 +#if defined(_WIN32) || !defined(YOSYS_ENABLE_GLOB) results.push_back(filename_pattern); #else glob_t globbuf; |