8003161: small fixes to re-enable new build system

Reviewed-by: dholmes, alanb, erikj
This commit is contained in:
Fredrik Öhrström 2012-11-08 12:25:15 +01:00
parent f95e6bbe59
commit 2d8ab98393
2 changed files with 2 additions and 2 deletions

View File

@ -1242,7 +1242,7 @@ ifdef OPENJDK
INCLUDE_FILES:=cmscam02.c cmscgats.c cmscnvrt.c cmserr.c \ INCLUDE_FILES:=cmscam02.c cmscgats.c cmscnvrt.c cmserr.c \
cmsgamma.c cmsgmt.c cmsintrp.c cmsio0.c \ cmsgamma.c cmsgmt.c cmsintrp.c cmsio0.c \
cmsio1.c cmslut.c cmsmd5.c cmsmtrx.c \ cmsio1.c cmslut.c cmsmd5.c cmsmtrx.c \
cmsnamed.c cmsopt.c cmspack.c cmspcs.c \ cmsnamed.c cmsopt.c cmshalf.c cmspack.c cmspcs.c \
cmsplugin.c cmsps2.c cmssamp.c cmssm.c \ cmsplugin.c cmsps2.c cmssamp.c cmssm.c \
cmstypes.c cmsvirt.c cmswtpnt.c cmsxform.c \ cmstypes.c cmsvirt.c cmswtpnt.c cmsxform.c \
LCMS.c,\ LCMS.c,\

View File

@ -271,7 +271,7 @@ endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
RT_JAR_EXCLUDES += com/sun/nio/sctp \ RT_JAR_EXCLUDES += com/sun/nio/sctp \
sun/nio/ch/sctp \ sun/nio/ch/sctp
endif endif
# Find all files in the classes dir to use as dependencies. This could be more fine granular. # Find all files in the classes dir to use as dependencies. This could be more fine granular.