# HG changeset patch
# User ihse
# Date 1520353496 -3600
# Node ID e9a335686df9745a7c7eb19d0485eb87dec1fb76
# Parent  6d825d74f4d62f77508d4990dfc2ef8d335d367f
8199118: Filtering of filename for microsoft CL broken on newer Cygwin
Reviewed-by: erikj

diff -r 6d825d74f4d6 -r e9a335686df9 make/common/NativeCompilation.gmk
--- a/make/common/NativeCompilation.gmk	Tue Mar 06 10:00:49 2018 -0500
+++ b/make/common/NativeCompilation.gmk	Tue Mar 06 17:24:56 2018 +0100
@@ -321,7 +321,7 @@
 	  $$(call ExecuteWithLog, $$@, \
 	      $$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
 	          $(CC_OUT_OPTION)$$($1_$2_OBJ) $2) \
-	      | $(GREP) -v -e "^Note: including file:" \
+	      | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
 	          -e "^$(notdir $2)$$$$" || test "$$$$?" = "1" ; \
 	  $(ECHO) $$@: \\ > $$($1_$2_DEP) ; \
 	  $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_OBJ).log \