# HG changeset patch
# User erikj
# Date 1484044291 -3600
# Node ID 17b5e2fe0130982212411c1ad9e16b7f29a50b7e
# Parent  6ff517127736582954795017434d1552c786e4d6
8170862: VarDeps breaks when a file with overridden CFLAGS has the same name as the library
Reviewed-by: tbell

diff -r 6ff517127736 -r 17b5e2fe0130 make/common/NativeCompilation.gmk
--- 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)