Kaydet (Commit) aa617a3a authored tarafından Michael Stahl's avatar Michael Stahl

concat-deps: Win32 make $(file) will end lines with CRLF

Change-Id: I3677de94e064c2f737cc7882b3cc4f42a6bf626a
üst ed4a51b8
...@@ -1137,7 +1137,9 @@ const char *env_str; ...@@ -1137,7 +1137,9 @@ const char *env_str;
/* extract filename of dep file from a 'space' separated list */ /* extract filename of dep file from a 'space' separated list */
while(*in_list_cursor) 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; *in_list_cursor = 0;
if(in_list_base < in_list_cursor) if(in_list_base < in_list_cursor)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment