Fixed rslib/Makefile using find from Windows, instead from POSIX

This commit is contained in:
evandrocoan 2020-02-24 21:36:14 -03:00
parent afeab0e559
commit 0f87955a29

View File

@ -1,5 +1,6 @@
SHELL := /bin/bash SHELL := /bin/bash
ECHOCMD := /bin/echo -e ECHOCMD := /bin/echo -e
FIND_EXEC := $(if $(wildcard /bin/find),,/usr)/bin/find
.SHELLFLAGS := -eu -o pipefail -c .SHELLFLAGS := -eu -o pipefail -c
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -25,7 +26,7 @@ develop: .build/vernum ftl/repo
ftl/repo: ftl/repo:
(cd ftl && ./scripts/fetch-latest-translations) (cd ftl && ./scripts/fetch-latest-translations)
ALL_SOURCE := $(shell find src -type f) $(wildcard ftl/*.ftl) ALL_SOURCE := $(shell ${FIND_EXEC} src -type f) $(wildcard ftl/*.ftl)
# nightly currently required for ignoring files in rustfmt.toml # nightly currently required for ignoring files in rustfmt.toml
RUST_TOOLCHAIN := $(shell cat rust-toolchain) RUST_TOOLCHAIN := $(shell cat rust-toolchain)