change which to command -v
This commit is contained in:
parent
583c3b4746
commit
5077d4c915
2 changed files with 3 additions and 3 deletions
4
Makefile
4
Makefile
|
@ -331,7 +331,7 @@ libtcc1.a : tcc$(EXESUF) FORCE
|
||||||
.PRECIOUS: %-libtcc1.a
|
.PRECIOUS: %-libtcc1.a
|
||||||
FORCE:
|
FORCE:
|
||||||
|
|
||||||
run-if = $(if $(shell which $1),$S $1 $2)
|
run-if = $(if $(shell command -v $1),$S $1 $2)
|
||||||
S = $(if $(findstring yes,$(SILENT)),@$(info * $@))
|
S = $(if $(findstring yes,$(SILENT)),@$(info * $@))
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
|
@ -412,7 +412,7 @@ ifneq "$(wildcard $(LIBTCC1_U))" ""
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# the msys-git shell works to configure && make except it does not have install
|
# the msys-git shell works to configure && make except it does not have install
|
||||||
ifeq ($(CONFIG_WIN32)-$(shell which install || echo no),yes-no)
|
ifeq ($(CONFIG_WIN32)-$(shell command -v install || echo no),yes-no)
|
||||||
install-win : INSTALL = cp
|
install-win : INSTALL = cp
|
||||||
install-win : INSTALLBIN = cp
|
install-win : INSTALLBIN = cp
|
||||||
endif
|
endif
|
||||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -67,7 +67,7 @@ case $targetos in
|
||||||
darwin=yes
|
darwin=yes
|
||||||
dwarf=4
|
dwarf=4
|
||||||
confvars="$confvars OSX"
|
confvars="$confvars OSX"
|
||||||
cc=`which cc`
|
cc=`command -v cc`
|
||||||
cc=`readlink $cc || echo clang`
|
cc=`readlink $cc || echo clang`
|
||||||
tcc_usrinclude="`xcrun --show-sdk-path`/usr/include"
|
tcc_usrinclude="`xcrun --show-sdk-path`/usr/include"
|
||||||
DLLSUF=".dylib"
|
DLLSUF=".dylib"
|
||||||
|
|
Loading…
Add table
Reference in a new issue