Merge

openjdk-mirror · May 20, 2010 · 2c11c84 · 2c11c84
2 parents 39364e0 + 8392ff7
commit 2c11c84
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/make/common/shared/Defs-windows.gmk b/make/common/shared/Defs-windows.gmk
@@ -287,11 +287,15 @@ ifeq ($(ARCH_DATA_MODEL), 32)
     # Assume VS100, then VS90, then VS80, then VS71
     _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC100.CRT)
     ifeq ($(_redist_sdk),)
-      _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT)
-      ifeq ($(_redist_sdk),)
-        _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
+      ifneq ($(VS100COMNTOOLS),)
+        _redist_sdk  :=c:/windows/system32
+      else
+        _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT)
         ifeq ($(_redist_sdk),)
-          _redist_sdk   :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
+          _redist_sdk   :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
+          ifeq ($(_redist_sdk),)
+            _redist_sdk   :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
+          endif
         endif
       endif
     endif

diff --git a/make/sun/jkernel/Makefile b/make/sun/jkernel/Makefile
@@ -52,6 +52,11 @@ ifeq ($(ARCH_DATA_MODEL), 32)
 
 ifeq ($(PLATFORM), windows)
 
+# If this is the VS Express compiler it will lack vc/atlmfc/
+ATL_MFC_DIR :=$(call DirExists,$(COMPILER_PATH)/../atlmfc,,)
+
+ifneq ($(ATL_MFC_DIR),)
+
 include FILES_c_windows.gmk
 
 vpath %.cpp   $(PLATFORM_SRC)/native/sun/jkernel
@@ -67,6 +72,8 @@ endif
 
 endif
 
+endif
+
 #
 # Resources
 #