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.
8170862: VarDeps breaks when a file with overridden CFLAGS has the same name as the library
authorerikj
Tue, 10 Jan 2017 11:31:31 +0100
changeset 43045 17b5e2fe0130
parent 43044 6ff517127736
child 43046 717ce6d4eaa1
8170862: VarDeps breaks when a file with overridden CFLAGS has the same name as the library Reviewed-by: tbell
make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions 
--- a/make/common/NativeCompilation.gmk	Tue Jan 10 11:28:25 2017 +0100
+++ b/make/common/NativeCompilation.gmk	Tue Jan 10 11:31:31 2017 +0100
@@ -288,8 +288,7 @@
         $$($1_$(notdir $2)_OPTIMIZATION)), )
       $1_$2_VARDEPS := $$($1_$(notdir $2)_CFLAGS) $$($1_$(notdir $2)_CXXFLAGS) \
           $$($1_$(notdir $2)_OPT_CFLAGS) $$($1_$(notdir $2)_OPT_CXXFLAGS)
-      $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \
-          $$(patsubst %$(OBJ_SUFFIX),%.vardeps,$$($1_$2_OBJ)))
+      $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, $$($1_$2_OBJ).vardeps)
     endif
 
     $$($1_$2_OBJ) : $2 $$($1_COMPILE_VARDEPS_FILE) $$($1_$2_VARDEPS_FILE) | $$($1_BUILD_INFO)
jdk-sandbox