aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2005-01-05 18:55:27 +0000
committerTom Tromey <tromey@gcc.gnu.org>2005-01-05 18:55:27 +0000
commit7385c7800907a0bae9a2ad1a10f8ba430ba707d4 (patch)
tree186a00b222824b4ab23ac4cf2f97e4d3729e6192
parent3dd7ab650554cd5e18c090fab7d6c309e522dd55 (diff)
downloadgcc-7385c7800907a0bae9a2ad1a10f8ba430ba707d4.zip
gcc-7385c7800907a0bae9a2ad1a10f8ba430ba707d4.tar.gz
gcc-7385c7800907a0bae9a2ad1a10f8ba430ba707d4.tar.bz2
natRuntime.cc (insertSystemProperties): Set java.ext.dirs earlier.
* java/lang/natRuntime.cc (insertSystemProperties): Set java.ext.dirs earlier. From-SVN: r92964
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/natRuntime.cc10
2 files changed, 11 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 90d2fe4..1393ebc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-05 Tom Tromey <tromey@redhat.com>
+
+ * java/lang/natRuntime.cc (insertSystemProperties): Set
+ java.ext.dirs earlier.
+
2005-01-05 Eric Botcazou <ebotcazou@libertysurf.fr>
* java/lang/natObject.cc (_Jv_ObjectCheckMonitor): Initialize the
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index 332f2c7..bf86522 100644
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -537,8 +537,13 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
SET ("user.region", "US");
}
+ // The java extensions directory.
+ SET ("java.ext.dirs", JAVA_EXT_DIRS);
+
// Set some properties according to whatever was compiled in with
- // `-D'.
+ // `-D'. Important: after this point, the only properties that
+ // should be set are those which either the user cannot meaningfully
+ // override, or which augment whatever value the user has provided.
for (int i = 0; _Jv_Compiler_Properties[i]; ++i)
{
const char *s, *p;
@@ -595,9 +600,6 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
// The name used to invoke this process (argv[0] in C).
SET ("gnu.gcj.progname", _Jv_GetSafeArg (0));
- // The java extensions directory.
- SET ("java.ext.dirs", JAVA_EXT_DIRS);
-
// Allow platform specific settings and overrides.
_Jv_platform_initProperties (newprops);