Prevent passing down MAKELEVEL/MAKEFLAGS from non-GNU make to GNU make.

tglsfdc · tglsfdc · commit fc2aafe4a55b · 2017-08-09T12:06:08.000-04:00
FreeBSD's make, for one, sets the MAKELEVEL environment variable when invoking commands. In the special Makefile we provide to hand off control from a non-GNU make to GNU make, this causes GNU make to think it is a child make invocation rather than top-level. That interferes with the hack added in commit dcae5fa to cause the temp-install tree to be made only by the top-level invocation of gmake. Unset the variable to prevent that. Likewise unset MAKEFLAGS, which FreeBSD's make also sets, and which could easily confuse gmake. There are no reports of actual trouble from that, but it seems better to be proactive. Back-patch to 9.5 where dcae5fa came in. Thomas Munro, hacked a bit more by me Discussion: https://postgr.es/m/CAEepm=1ueww35AXTkt1A3gyzZUqv5XCzh8RUNvJZAQAW=eOhVw@mail.gmail.com
diff --git a/Makefile b/Makefile
@@ -29,6 +29,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean
 	\
 	 if [ x"$${GMAKE+set}" = xset ]; then \
 	   echo "Using GNU make found at $${GMAKE}"; \
+	   unset MAKEFLAGS; unset MAKELEVEL; \
 	   $${GMAKE} $@ ; \
 	 else \
 	   echo "You must use GNU make to build PostgreSQL." ; \

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean`
`29`	`29`	`\`
`30`	`30`	`if [ x"$${GMAKE+set}" = xset ]; then \`
`31`	`31`	`echo "Using GNU make found at $${GMAKE}"; \`
	`32`	`+ unset MAKEFLAGS; unset MAKELEVEL; \`
`32`	`33`	`$${GMAKE} $@ ; \`
`33`	`34`	`else \`
`34`	`35`	`echo "You must use GNU make to build PostgreSQL." ; \`