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

7 years ago · fdf988cd28
parent 8212fd6bf4 c2283fca21
commit fdf988cd28
1 changed files with 6 additions and 1 deletions
--- a/7
+++ b/7
@ -605,7 +605,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 \