Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8075054: Mixed case Windows path break native dependency checks
authorihse
Fri, 13 Mar 2015 14:00:36 +0100
changeset 29436 91f4e8a8134f
parent 29433 c97e2d1bad97
child 29437 807b7c4a4e62
8075054: Mixed case Windows path break native dependency checks Reviewed-by: erikj
make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions 
--- a/make/common/NativeCompilation.gmk	Wed Jul 05 20:24:25 2017 +0200
+++ b/make/common/NativeCompilation.gmk	Fri Mar 13 14:00:36 2015 +0100
@@ -60,7 +60,7 @@
     -e 's|Note: including file: *||' \
     -e 's|\\|/|g' \
     -e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \
-    -e '/$(subst /,\/,$(TOPDIR))/!d' \
+    -e '\|$(TOPDIR)|I !d' \
     -e 's|$$$$| \\|g' \
     #
 
@@ -153,7 +153,7 @@
 	      exit `cat $$($1_$2_DEP).exitvalue`
 	  $(RM) $$($1_$2_DEP).exitvalue
 	  ($(ECHO) $$@: \\ \
-	  && $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_DEP).raw) > $$($1_$2_DEP)
+	  && $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_$2_DEP).raw) | $(SORT) -u > $$($1_$2_DEP)
         endif
         # Create a dependency target file from the dependency file.
         # Solution suggested by http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/
jdk-sandbox