changeset 49136:e9a335686df9

8199118: Filtering of filename for microsoft CL broken on newer Cygwin Reviewed-by: erikj
author ihse
date Tue, 06 Mar 2018 17:24:56 +0100
parents 6d825d74f4d6
children 50f5ea3292f1
files make/common/NativeCompilation.gmk
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 \