From b324b462d09fe06ea6197323ee5952f5e5118e80 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Fri, 15 May 2009 13:14:40 -0700 Subject: [PATCH] 6841873: Fix windows redist default location for msvc runtime dlls Reviewed-by: tbell --- jdk/make/common/shared/Defs-windows.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/make/common/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk index abaa6a1807e..ceaa61e665e 100644 --- a/jdk/make/common/shared/Defs-windows.gmk +++ b/jdk/make/common/shared/Defs-windows.gmk @@ -277,9 +277,9 @@ ifeq ($(ARCH_DATA_MODEL), 32) # Assume PlatformSDK is in VS71 (will be empty if VS90) _ms_sdk :=$(call FullPath,$(_msvc_dir)/PlatformSDK) # Assume VS90, then VS80, then VS71 - _redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v3.5/Bin) + _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT) ifeq ($(_redist_sdk),) - _redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v2.0/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