Guard a few Makefile variables against user environments
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Mar 25, 2009 at 17:27 UTC
5c928c06e251b651202f94aaac56cacd3f57c484
1 file changed
+12
Makefile
+12
@@ -263,6 +263,18 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
263
BASIC_CFLAGS =
264
BASIC_LDFLAGS =
265
266
+# Guard against environment variables
267
+BUILTIN_OBJS =
268
+BUILT_INS =
269
+COMPAT_CFLAGS =
270
+COMPAT_OBJS =
271
+LIB_H =
272
+LIB_OBJS =
273
+PROGRAMS =
274
+SCRIPT_PERL =
275
+SCRIPT_SH =
276
+TEST_PROGRAMS =
277
+
278
SCRIPT_SH += git-am.sh
279
SCRIPT_SH += git-bisect.sh
280
SCRIPT_SH += git-filter-branch.sh