# HG changeset patch
# User kevinw
# Date 1524135538 25200
# Node ID 888144400d978e40a004dd8b908025a31135c092
# Parent  47fda751abb6d4665e77adc849baf5953be89aaa# Parent  5912f0f784f62f278c6ce842e4bc84cae9209461
Merge

diff -r 47fda751abb6 -r 888144400d97 make/common/NativeCompilation.gmk
--- a/make/common/NativeCompilation.gmk	Wed Apr 18 02:21:14 2018 -0700
+++ b/make/common/NativeCompilation.gmk	Thu Apr 19 03:58:58 2018 -0700
@@ -122,6 +122,7 @@
 	  ($(ECHO) $$@: \\ \
 	  && $(SED) -e '/^Note: including file:/!d' \
 	      -e 's|Note: including file: *||' \
+          -e 's|\r||g' \
 	      -e 's|\\|/|g' \
 	      -e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \
 	      -e '/$(subst /,\/,$(TOPDIR))/!d' \