From a556fa198301657b49e43a4329bc511d5ee198ec Mon Sep 17 00:00:00 2001 From: John Schoenick Date: Tue, 28 Aug 2018 17:16:23 -0700 Subject: [PATCH] makefile_base.mak: Fix nested make invoking wrong makefile Effectively a no-op since outer makefile only sets variables we'd inherit either way, but a silly landmine --- build/makefile_base.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index ae7b8875..8d1f101c 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -17,7 +17,7 @@ export $(MAKECMDGOALS): nested_make nested_make: - $(MAKE) $(MAKECMDGOALS) -f ../build/makefile_base.mak NO_NESTED_MAKE=1 + $(MAKE) $(MAKECMDGOALS) -f $(firstword $(MAKEFILE_LIST)) NO_NESTED_MAKE=1 else # (Rest of the file is the else)