From: Bryce McKinlay <bryce@gcc.gnu.org>
Date: Tue, 15 Feb 2000 08:52:03 +0000 (+0000)
Subject: natSystem.cc (init_properties): set java.lang.classpath property.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12e7d63aecaeb1ec0556074b3898509875ab62d7;p=gcc.git

natSystem.cc (init_properties): set java.lang.classpath property.

        * java/lang/natSystem.cc (init_properties): set java.lang.classpath
        property.

From-SVN: r31981
---

diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 35093df927e..78ea75c84ab 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -261,9 +261,9 @@ java::lang::System::init_properties (void)
   SET ("java.specification.name", "Java(tm) Language Specification");
   SET ("java.specification.vendor", "Sun Microsystems Inc.");
 
-  // FIXME: how to set these given location-independence?
+  // FIXME: how to set this given location-independence?
   // SET ("java.home", "FIXME");
-  // SET ("java.class.path", "FIXME");
+  
   SET ("file.encoding", default_file_encoding);
 
 #ifdef WIN32
@@ -296,6 +296,13 @@ java::lang::System::init_properties (void)
     }
 #endif /* HAVE_UNAME */
 
+  char *classpath = ::getenv("CLASSPATH");
+  // FIXME: find libgcj.zip and append its path?
+  if (classpath != NULL)
+    SET ("java.class.path", classpath);
+  else
+    SET ("java.class.path", ".");
+
 #ifndef NO_GETUID
 #ifdef HAVE_PWD_H
   uid_t user_id = getuid ();