diff options
| author | whitequark <whitequark@whitequark.org> | 2019-09-04 18:55:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 18:55:17 +0000 |
| commit | 8c1a98249457b790895aee76115ddd40ec891555 (patch) | |
| tree | 2c41ab59bd2d5ac2913bbb30352eda33fe3c23e8 | |
| parent | 3c462e5eeb5d24f5252bc1e7437f91372ec48fd0 (diff) | |
| parent | a7ea6a6fcf964f3c368b634e1fcc2c29d3bfdce4 (diff) | |
| download | yosys-8c1a98249457b790895aee76115ddd40ec891555.tar.gz yosys-8c1a98249457b790895aee76115ddd40ec891555.tar.bz2 yosys-8c1a98249457b790895aee76115ddd40ec891555.zip | |
Merge pull request #1354 from emilazy/remove-which-use
Replace `which` with `command -v` in Makefile too
| -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 which 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 which port),) -PORT_PREFIX := $(patsubst %/bin/port,%,$(shell which 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) |