Merge

Thu, 19 Apr 2018 03:58:58 -0700

author
kevinw
date
Thu, 19 Apr 2018 03:58:58 -0700
changeset 2221
888144400d97
parent 2220
47fda751abb6
parent 2218
5912f0f784f6
child 2222
7129b977c4af

Merge

make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/make/common/NativeCompilation.gmk	Wed Apr 18 02:21:14 2018 -0700
     1.2 +++ b/make/common/NativeCompilation.gmk	Thu Apr 19 03:58:58 2018 -0700
     1.3 @@ -122,6 +122,7 @@
     1.4  	  ($(ECHO) $$@: \\ \
     1.5  	  && $(SED) -e '/^Note: including file:/!d' \
     1.6  	      -e 's|Note: including file: *||' \
     1.7 +          -e 's|\r||g' \
     1.8  	      -e 's|\\|/|g' \
     1.9  	      -e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \
    1.10  	      -e '/$(subst /,\/,$(TOPDIR))/!d' \

mercurial