diff options
| author | Steven Knight <knight@baldmt.com> | 2003-06-28 05:13:23 +0000 |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-06-28 05:13:23 +0000 |
| commit | 007b42c9a8eb58d83c7cc95d504384295e8f3a1a (patch) | |
| tree | ef87c38543979dc5f849282c3d0f60daa7554047 | |
| parent | 6b7492bf09a6c2e49b2077cbf966915bb7eba77d (diff) | |
| download | scons-007b42c9a8eb58d83c7cc95d504384295e8f3a1a.tar.gz | |
[Update CVS with a previously un-synchronized change.]
| -rw-r--r-- | config | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -56,9 +56,10 @@ build_command = "python ${Source bootstrap.py} -Y${SUBSTitute : \\ -Y $Search_Pa * 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; */ +link_integration_directory = true; + /* * This is set temporarily to allow us to build using the SCons * currently checked in to the src directory. @@ -233,9 +234,16 @@ merge -p -L baseline -L C$c ${quote $mostrecent} ${quote $original} \ ${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"; /* |