Merge "BuildSystem: Do not warn when bash is not installed."

7 years ago · be2292a2f5
parent d6147aa6a3 f9ba31bb21
commit be2292a2f5
1 changed files with 6 additions and 1 deletions
--- a/7
+++ b/7
@ -604,7 +604,12 @@ $(SUBDIRS_INSTALL):

 NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
 OLDMODS=$(filter-out $(NEWMODS) $(notdir $(DESTDIR)$(ASTMODDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTMODDIR)/*.so)))
-BADMODS=$(strip $(filter-out $(shell ./build_tools/list_valid_installed_externals),$(OLDMODS)))
+ifneq ($(BASH),:)
+	FILMODS=$(filter-out $(shell ./build_tools/list_valid_installed_externals),$(OLDMODS))
+else
+	FILMODS=$(OLDMODS)
+endif
+BADMODS=$(strip $(FILMODS))

 oldmodcheck:
 	@if [ -n "$(BADMODS)" ]; then \