stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers

Browse Source 
Reviewed-by: ohair, jcoomes
This commit is contained in:
Phil Race 2010-06-16 09:42:39 -07:00
parent ff41c48f12
commit 2e9f8b9c55
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
jdk/make/common/shared/Defs-windows.gmk
View File

@ -331,23 +331,50 @@ ifeq ($(_ms_sdk),)
endif endif
endif endif
# Compilers for 64bit may be from SDK. For VS 2010 we use those. # Compilers for 64bit may be from the free SDK, or Visual Studio Professional
# The Express compilers don't contain 64 bit compilers, so in # The free Express compilers don't contain 64 bit compilers, which is why
# that case, you additionally need the SDK. At this time, # you instead need the SDK.
# there's no 64 bit SDK available that has VS 2010. # So for VS2010 based builds, either VS2010 Pro with the 7.0a SDK, or
# Presumably SDK v7.1 will provide that and we may want to update # the Windows 7.1 standalone SDK with compilers may be used.
# the logic here to work with that. # Release enginering will use VS2010 Pro, so the frequency of testing of
# However official builds will use the Professional version. # SDK based builds will depend entirely on individual usage.
ifeq ($(ARCH_DATA_MODEL), 64) ifeq ($(ARCH_DATA_MODEL), 64)
ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc
# VS2010 default location is used when building 64 bit using the 7.1 SDK
# This is safe to hardwire as the SDK installer won't let you change it
# and the VS2010 variable is only used if the compilers are from the SDK
xVS2010 :="$(_program_files32)/Microsoft Visual Studio 10.0/"
VS2010 :=$(call FullPath,$(xVS2010))
xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))" xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
_vs100tools :=$(call FullPath,$(xVS100COMNTOOLS)) _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
endif endif
ifneq ($(_vs100tools),) ifneq ($(_vs100tools),)
_compiler_bin :=$(_vs100tools)/../../Vc/bin/amd64 _compiler_bin :=$(_vs100tools)/../../Vc/bin/amd64
_redist_sdk :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT x_redist_sdk :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT
xMSSDK70 :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/" _redist_sdk :=$(call FullPath,$(x_redist_sdk))
MSSDK70 :=$(call FullPath,$(xMSSDK70)) # The SDK doesn't have the redist directory, but the DLL is installed
# into the windows directory.
ifeq ($(_redist_sdk),)
_redist_sdk :=c:/windows/system32
endif
# Not currently using MSSDK7n, but maybe we can make use of it for
# doing default location lookup to find some SDK tools that presently
# require the developer to explicitly set the path.
# The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK.
# Either will work for us.
# If a developer chooses to install the standalone SDK in some other
# location, then this will fail to find it, which won't matter so long as
# we aren't using this variable. If we do they'd still need to set the
# ALT_MSDEVTOOLS_PATH as now.
# %WindowsSdkDir% could be referenced instead but the SDK installer
# doesn't set it and in the case of the VS2010 compilers,
# you can't change this location in the installer anyway.
xMSSDK7n :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/"
MSSDK7n :=$(call FullPath,$(xMSSDK7n))
ifeq ($(MSSDK7n),)
xMSSDK7n :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/"
MSSDK7n :=$(call FullPath,$(xMSSDK7n))
endif
else else
xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/" xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/"
VS2008 :=$(call FullPath,$(xVS2008)) VS2008 :=$(call FullPath,$(xVS2008))
@ -355,7 +382,7 @@ ifeq ($(ARCH_DATA_MODEL), 64)
_compiler_bin :=$(VS2008)/VC/Bin/$(ARCH) _compiler_bin :=$(VS2008)/VC/Bin/$(ARCH)
xMSSDK61 :="$(_program_files)/Microsoft SDKs/Windows/v6.1/" xMSSDK61 :="$(_program_files)/Microsoft SDKs/Windows/v6.1/"
MSSDK61 :=$(call FullPath,$(xMSSDK61)) MSSDK61 :=$(call FullPath,$(xMSSDK61))
_redist_sdk :=$(VS2008)/VC/redist/x86/Microsoft.VC90.CRT _redist_sdk :=$(VS2008)/VC/redist/x64/Microsoft.VC90.CRT
else else
ifneq ($(_ms_sdk),) ifneq ($(_ms_sdk),)
ifeq ($(ARCH), ia64) ifeq ($(ARCH), ia64)