Commits

Anonymous committed 662f43c

[Update CVS with a previously un-synchronized change.]

  • Participants
  • Parent commits a256aa8

Comments (0)

Files changed (1)

  * SCons removes its targets before constructing them, which qualifies it
  * for the following entry in the config file.  The files must be removed
  * first, otherwise the baseline would cease to be self-consistent.
+ */
+
 link_integration_directory = true;
- */
 
 /*
  * This is set temporarily to allow us to build using the SCons
 ${quote $input} > ${quote $output}; \
 test $? -le 1";
 
+/*
+ * The diff command in Red Hat 8.0 changed the exit status so it *fails*
+ * when *it* thinks it's trying to diff a binary (non-ASCII-text) file.
+ * The -a option disables this behavior and makes diff's exit status
+ * behave like it used to, even on any binary files we have checked in.
+ */
+
 diff_command =
 	"set +e; \
-	diff -c ${quote $original} ${quote $input} > ${quote $output}; \
+	diff -a -c ${quote $original} ${quote $input} > ${quote $output}; \
 	test $? -le 1";
 
 /*