# HG changeset patch
# User igor
# Date 1278465794 25200
# Node ID 6562557739c0052cfd6d2d85cecf345ad27deecf
# Parent  482a2721c61a76cb2b258a26e8806eef5322b75d
6967050: JDK build issues with cygwin/vc2010
Reviewed-by: prr, ohair

diff -r 482a2721c61a -r 6562557739c0 jdk/make/common/shared/Defs-windows.gmk
--- a/jdk/make/common/shared/Defs-windows.gmk	Wed Jun 30 15:09:24 2010 -0700
+++ b/jdk/make/common/shared/Defs-windows.gmk	Tue Jul 06 18:23:14 2010 -0700
@@ -230,7 +230,8 @@
 
 # Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit]
 ifeq ($(ARCH_DATA_MODEL), 32)
-  # Try looking in MSVCDIR or MSVCDir area first (set by vcvars32.bat)
+  # Try looking in MSVCDIR or MSVCDir area first 
+  # (set by vcvars32.bat for VC .NET, not defined in the VC 2008/2010)
   ifdef MSVCDIR
     xMSVCDIR  :="$(subst \,/,$(MSVCDIR))"
     _msvc_dir :=$(call FullPath,$(xMSVCDIR))
@@ -238,11 +239,6 @@
     ifdef MSVCDir
       xMSVCDIR  :="$(subst \,/,$(MSVCDir))"
       _msvc_dir :=$(call FullPath,$(xMSVCDIR))
-    else
-      ifneq ($(_program_files),)
-        xMSVCDIR  :="$(_program_files)/Microsoft Visual Studio .NET 2003/Vc7"
-        _msvc_dir :=$(call FullPath,$(xMSVCDIR))
-      endif
     endif
   endif
   # If we still don't have it, look for VSnnCOMNTOOLS (newest first),
diff -r 482a2721c61a -r 6562557739c0 jdk/make/mkdemo/Makefile
--- a/jdk/make/mkdemo/Makefile	Wed Jun 30 15:09:24 2010 -0700
+++ b/jdk/make/mkdemo/Makefile	Tue Jul 06 18:23:14 2010 -0700
@@ -46,11 +46,11 @@
 	$(RM) -r $(DEMODIR)/nbproject
 	$(MKDIR) -p $(DEMODIR)
 	( $(CD) $(SHARE_SRC)/demo && $(TAR) -cf - \
-	  `find nbproject $(SCM_DIRS_prune) -o -type f -print` ) | \
+	  `$(FIND) nbproject $(SCM_DIRS_prune) -o -type f -print` ) | \
 	  ( $(CD) $(DEMODIR) && $(TAR) -xf - )
 ifndef OPENJDK
 	( $(CD) $(CLOSED_SHARE_SRC)/demo && $(TAR) -cf - \
-	  `find nbproject $(SCM_DIRS_prune) -o -type f -print` ) | \
+	  `$(FIND) nbproject $(SCM_DIRS_prune) -o -type f -print` ) | \
 	  ( $(CD) $(DEMODIR) && $(TAR) -xf - )
 endif