threads / patch / 18537

patchGuard a few Makefile variables against user environments

Subject: [PATCH] Guard a few Makefile variables against user environments

## tl;dr

One message between Mar 25, 2009 and Mar 25, 2009. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Johannes Schindelin· Mar 25, 2009, 16:27 UTC · lore

Some variables are not initialized in the Makefile, but appended to. If the user has those variables in her environment, it will break the build.

The variable names were found using these commands:
	$ s='[ \t]';
	$ S='[^ \t]';
	$ comm -23 \
		<(sed -n "s/^$s*\($S*\)$s$s*+=.*/\1/p" < Makefile |
		  sort | uniq) \
		<(sed -n "s/^$s*\($S*\)$s$s*=.*/\1/p" < Makefile |
		  sort | uniq)
This fixes msysGit issue 216.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Makefile |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
Show changes to Makefile +12 −0
diff --git a/Makefile b/Makefile
index 43a8364..d77fd71 100644
--- a/Makefile
+++ b/Makefile
@@ -263,6 +263,18 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
 BASIC_CFLAGS =
 BASIC_LDFLAGS =
 
+# Guard against environment variables
+BUILTIN_OBJS =
+BUILT_INS =
+COMPAT_CFLAGS =
+COMPAT_OBJS =
+LIB_H =
+LIB_OBJS =
+PROGRAMS =
+SCRIPT_PERL =
+SCRIPT_SH =
+TEST_PROGRAMS =
+
 SCRIPT_SH += git-am.sh
 SCRIPT_SH += git-bisect.sh
 SCRIPT_SH += git-difftool-helper.sh
-- 
1.6.2.1.493.g67cf3

← back to recent threads