postgres.git / summary / log / commit / refs

commit    fc2aafe4a55beb7fe73b9f4cbbb1e49f5b7cb2dd
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Aug 09 16:05:53 2017 +0000

    Prevent passing down MAKELEVEL/MAKEFLAGS from non-GNU make to GNU make.
    
    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 dcae5facc 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 dcae5facc came in.
    
    Thomas Munro, hacked a bit more by me
    
    Discussion: https://postgr.es/m/CAEepm=1ueww35AXTkt1A3gyzZUqv5XCzh8RUNvJZAQAW=eOhVw@mail.gmail.com


 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 72e9c837330..4c68950e907 100644
--- 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." ; \


[parent: fe578cbd4b42]