From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 17 Jan 2007 22:59:10 +0000 (+0000)
Subject: 	* tools/gnu/classpath/tools/javah/PathOptionGroup.java
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72ed03376d9faf97a453ac312879b662d7e5afa3;p=thirdparty%2Fgcc.git

	* tools/gnu/classpath/tools/javah/PathOptionGroup.java
	(PathOptionGroup): Set default boot class path.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120882 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 83de49090b6a..3a3d8a221fe4 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Tom Tromey  <tromey@redhat.com>
+
+	* tools/gnu/classpath/tools/javah/PathOptionGroup.java
+	(PathOptionGroup): Set default boot class path.
+
 2006-12-14  Andrew Haley  <aph@redhat.com>
 
 	* tools/gnu/classpath/tools/jar/Creator.java: Close the
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class
index 0613196320c8..a4fe014e1372 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$2.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class
index 8e7c07f5904f..6786f255ac56 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$3.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class
index 1e0725da07be..08d44961c3eb 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$4.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class
index 5791d4f82690..e8f36fc5b3e3 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup$5.class differ
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class
index 4833679fb4b5..41960117caaa 100644
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/PathOptionGroup.class differ
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
index 4287354aed65..efb5f7a70b2e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/PathOptionGroup.java
@@ -1,5 +1,5 @@
 /* PathOptionGroup.java - handle classpath-setting options
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -89,6 +89,11 @@ public class PathOptionGroup
   {
     super("Class path options");
 
+    // Use the VM's built-in boot class path by default.
+    String boot = System.getProperty("sun.boot.class.path");
+    if (boot != null)
+      setPath(bootclasspath, boot);
+
     add(new Option("classpath", "Set the class path", "PATH")
     {
       public void parsed(String path) throws OptionException