archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003

Browse source 
Reviewed-by: tbell
This commit is contained in:
Kelly O'Hair 2009-03-11 17:31:56 -07:00
parent 83f34e5507
commit ad9390102d
3 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
corba/make/common/shared/Compiler-msvc.gmk
View file

@ -128,9 +128,19 @@ ifeq ($(PLATFORM), windows)
endif
endif
endif
# This will cause problems if ALT_COMPILER_PATH is defined to ""
# which is a directive to use the PATH.
REBASE = $(COMPILER_PATH)../REBASE
ifeq ($(CC_MAJORVER), 15)
# This should be: CC_VER=15.00.21022.8 LINK_VER=9.00.21022.8
REQUIRED_CC_VER = 15.00.21022.8
REQUIRED_LINK_VER = 9.00.21022.8
COMPILER_NAME=Windows SDK 6.1 Visual Studio 9
COMPILER_VERSION=VS2008
RC = $(MSSDK61)/bin/x64/rc
REBASE = $(MSSDK61/bin/x64/rebase
else
# This will cause problems if ALT_COMPILER_PATH is defined to ""
# which is a directive to use the PATH.
REBASE = $(COMPILER_PATH)../REBASE
endif
ifndef COMPILER_PATH
COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
endif