diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-02 01:30:39 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:49 +0200 |
| commit | aa617a3a594e81d2e3ff679ed5e1a9c33fcb419f (patch) | |
| tree | 376bc0931bfea556d5dbaa0c349d02e3992a2437 /solenv | |
| parent | ed4a51b84b05eea24f9e1cb0bdc2058c2fe6f06f (diff) | |
concat-deps: Win32 make $(file) will end lines with CRLF
Change-Id: I3677de94e064c2f737cc7882b3cc4f42a6bf626a
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/concat-deps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index f2e7617732c9..d513430c89b0 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -1137,7 +1137,9 @@ const char *env_str; /* extract filename of dep file from a 'space' separated list */ while(*in_list_cursor) { - if(*in_list_cursor == ' ' || *in_list_cursor == '\n') + /* the input here may contain Win32 \r\n EOL */ + if(*in_list_cursor == ' ' + || *in_list_cursor == '\n' || *in_list_cursor == '\r') { *in_list_cursor = 0; if(in_list_base < in_list_cursor) |