changeset 5251:bdbc32b2f920

7130959: Tweak 7058133 fix for JDK 8 (javah makefile changes) Summary: Fixed JAVAHFLAGS setting to use -bootclasspath. Reviewed-by: wetmore
author valeriep
date Thu, 15 Mar 2012 14:28:48 -0700
parents 0e4f259f0a1f
children e48136bb8fdd
files make/sun/security/ec/Makefile make/sun/security/mscapi/Makefile make/sun/security/pkcs11/Makefile
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/security/ec/Makefile	Wed Mar 14 09:03:08 2012 -0700
+++ b/make/sun/security/ec/Makefile	Thu Mar 15 14:28:48 2012 -0700
@@ -159,7 +159,9 @@
       $(PKGDIR)/ECDSASignature.java \
       $(PKGDIR)/ECKeyPairGenerator.java
 
-  JAVAHFLAGS += -Xbootclasspath/p:$(CLASSDESTDIR)
+  JAVAHFLAGS = -bootclasspath \
+      "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
+
 
   #
   # C and C++ files
--- a/make/sun/security/mscapi/Makefile	Wed Mar 14 09:03:08 2012 -0700
+++ b/make/sun/security/mscapi/Makefile	Thu Mar 15 14:28:48 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -149,7 +149,8 @@
 # Rules
 #
 CLASSDESTDIR = $(TEMPDIR)/classes
-JAVAHFLAGS += -Xbootclasspath/p:$(CLASSDESTDIR)
+JAVAHFLAGS = -bootclasspath \
+  "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
 
 include $(BUILDDIR)/common/Mapfile-vers.gmk
 
--- a/make/sun/security/pkcs11/Makefile	Wed Mar 14 09:03:08 2012 -0700
+++ b/make/sun/security/pkcs11/Makefile	Thu Mar 15 14:28:48 2012 -0700
@@ -150,7 +150,8 @@
 # Rules
 #
 CLASSDESTDIR = $(TEMPDIR)/classes
-JAVAHFLAGS = -bootclasspath "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
+JAVAHFLAGS = -bootclasspath \
+    "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
 
 include $(BUILDDIR)/common/Mapfile-vers.gmk