diff options
author | whitequark <whitequark@whitequark.org> | 2019-09-05 00:20:47 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-05 00:20:47 +0000 |
commit | 8d9196066370b156ae2beefed5aa2da545255e4c (patch) | |
tree | c51305cf5b837d4898df6202520f051d4b189e85 | |
parent | 8c1a98249457b790895aee76115ddd40ec891555 (diff) | |
parent | a9af28694ce5fbcf4cdfd0c3cb440c08681f8f16 (diff) | |
download | yosys-8d9196066370b156ae2beefed5aa2da545255e4c.tar.gz yosys-8d9196066370b156ae2beefed5aa2da545255e4c.tar.bz2 yosys-8d9196066370b156ae2beefed5aa2da545255e4c.zip |
Merge pull request #1356 from emilazy/fix-makefile-shell
Use $(shell :; ...) in Makefile to force shell
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -88,7 +88,7 @@ ifeq ($(OS), Darwin) PLUGIN_LDFLAGS += -undefined dynamic_lookup # homebrew search paths -ifneq ($(shell command -v brew),) +ifneq ($(shell :; command -v brew),) BREW_PREFIX := $(shell brew --prefix)/opt $(info $$BREW_PREFIX is [${BREW_PREFIX}]) ifeq ($(ENABLE_PYOSYS),1) @@ -102,8 +102,8 @@ PKG_CONFIG_PATH := $(BREW_PREFIX)/tcl-tk/lib/pkgconfig:$(PKG_CONFIG_PATH) export PATH := $(BREW_PREFIX)/bison/bin:$(BREW_PREFIX)/gettext/bin:$(BREW_PREFIX)/flex/bin:$(PATH) # macports search paths -else ifneq ($(shell command -v port),) -PORT_PREFIX := $(patsubst %/bin/port,%,$(shell command -v port)) +else ifneq ($(shell :; command -v port),) +PORT_PREFIX := $(patsubst %/bin/port,%,$(shell :; command -v port)) CXXFLAGS += -I$(PORT_PREFIX)/include LDFLAGS += -L$(PORT_PREFIX)/lib PKG_CONFIG_PATH := $(PORT_PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH) |