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.
Merge
authorohair
Mon, 10 Jan 2011 22:26:47 -0800
changeset 8014 25dfeb6aed42
parent 8013 4efa283dbce2 (current diff)
parent 8012 9bba5ba6e196 (diff)
child 8015 f8d87fffd55c
child 8016 dddde5ff035d
Merge
--- a/jdk/make/common/shared/Defs-windows.gmk	Mon Jan 10 18:07:58 2011 -0800
+++ b/jdk/make/common/shared/Defs-windows.gmk	Mon Jan 10 22:26:47 2011 -0800
@@ -288,8 +288,8 @@
     xVS100COMNTOOLS :="$(_program_files32)/Microsoft Visual Studio 10.0/Common7/Tools/"
     fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
   else
+    xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
     ifneq ($(word 2,$(VS100COMNTOOLS)),)
-      xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
       fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
     else
       fVS100COMNTOOLS :=$(xVS100COMNTOOLS)
jdk-sandbox