Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8003161: small fixes to re-enable new build system
authorohrstrom
Thu, 08 Nov 2012 12:25:15 +0100
changeset 14425 0005b8b4ec0b
parent 14424 4fea64e92e7f
child 14426 2f6942e2316a
8003161: small fixes to re-enable new build system Reviewed-by: dholmes, alanb, erikj
jdk/makefiles/CompileNativeLibraries.gmk file | annotate | diff | comparison | revisions
jdk/makefiles/CreateJars.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/makefiles/CompileNativeLibraries.gmk	Wed Nov 07 23:12:45 2012 -0500
+++ b/jdk/makefiles/CompileNativeLibraries.gmk	Thu Nov 08 12:25:15 2012 +0100
@@ -1242,7 +1242,7 @@
 		INCLUDE_FILES:=cmscam02.c cmscgats.c cmscnvrt.c cmserr.c \
 			       cmsgamma.c cmsgmt.c cmsintrp.c cmsio0.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 \
 			       cmstypes.c cmsvirt.c cmswtpnt.c cmsxform.c \
 			       LCMS.c,\
--- a/jdk/makefiles/CreateJars.gmk	Wed Nov 07 23:12:45 2012 -0500
+++ b/jdk/makefiles/CreateJars.gmk	Thu Nov 08 12:25:15 2012 +0100
@@ -271,7 +271,7 @@
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
         RT_JAR_EXCLUDES += com/sun/nio/sctp \
-                           sun/nio/ch/sctp \
+                           sun/nio/ch/sctp
 endif
 
 # Find all files in the classes dir to use as dependencies. This could be more fine granular.
jdk-sandbox