From a80e2775ef0dd1f012d40ae2f5be8421e526ea14 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Sun, 23 Oct 2011 13:44:42 +0000 Subject: [PATCH] Clear the environment before running the cryptlib submake. This is because the Cryptlib makefile doesn't use $(MAKE) for submakes and instead hardcodes the string "make" since gmake -C sets MAKEFLAGS to "w", this ends up breaking builds on systems where the first make in the path doesn't support the non-standard -w option. --- 3rdp/build/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile index ad86522549..49343fa999 100644 --- a/3rdp/build/GNUmakefile +++ b/3rdp/build/GNUmakefile @@ -45,6 +45,6 @@ $(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip | $(CRYPT_SRC) $(CRYPT @echo Creating $@ ... $(QUIET)-rm -rf $(CRYPT_SRC)/* $(QUIET)unzip -oua $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC) - $(QUIET)make -C $(CRYPT_SRC) + $(QUIET)env - PATH=$(PATH) make -C $(CRYPT_SRC) $(QUIET)cp $(CRYPT_SRC)$(DIRSEP)libcl.a $(CRYPT_IDIR) $(QUIET)cp $(CRYPT_SRC)$(DIRSEP)cryptlib.h $(CRYPT_IDIR) -- GitLab