Merge "build_system: Prevent goals needing makeopts from running when it's missing"

9 years ago · 9a67730d79
parent 51547175c0 c53903d447
commit 9a67730d79
1 changed files with 4 additions and 1 deletions
--- a/5
+++ b/5
@ -100,7 +100,10 @@ export LDCONFIG
 export LDCONFIG_FLAGS
 export PYTHON

-include makeopts
+# makeopts is required unless the goal is clean or distclean
+ifeq ($(findstring clean,$(MAKECMDGOALS)),)
+include makeopts
+endif

 # start the primary CFLAGS and LDFLAGS with any that were provided
 # to the configure script