diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-02-10 14:27:53 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-02-10 14:27:53 +0000 |
| commit | 692c6ad2bf91aa058c3df043ed8bab64181425d6 (patch) | |
| tree | df09f4cdefcd6508956c85f8ca3407a3e1ad922b /gcc/java/jcf-path.c | |
| parent | c6d8446f53e7180d07e2f9b4062267f1a9a7d42e (diff) | |
| download | gcc-692c6ad2bf91aa058c3df043ed8bab64181425d6.tar.gz | |
* jvspec.c (lang_specific_driver): Use libgcj, not libjava.
* Makefile.in (jcf-path.o): Define LIBGCJ_ZIP_FILE.
(libgcj_zip): Renamed.
* jcf-path.c (add_entry): Use LIBGCJ_ZIP_FILE, not
LIBJAVA_ZIP_FILE.
(jcf_path_init): Use LIBGCJ_ZIP_FILE.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@25136 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/jcf-path.c')
| -rw-r--r-- | gcc/java/jcf-path.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/java/jcf-path.c b/gcc/java/jcf-path.c index 13fed50ca8c..0c590c57603 100644 --- a/gcc/java/jcf-path.c +++ b/gcc/java/jcf-path.c @@ -1,6 +1,6 @@ /* Handle CLASSPATH, -classpath, and path searching. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ struct entry /* We support several different ways to set the class path. - built-in system directory (only libjava.zip) + built-in system directory (only libgcj.zip) CLASSPATH environment variable -CLASSPATH overrides CLASSPATH -classpath option - overrides CLASSPATH, -CLASSPATH, and built-in @@ -146,10 +146,10 @@ add_entry (entp, filename, is_system) { n->flags |= FLAG_ZIP; /* If the user uses -classpath then he'll have to include - libjava.zip in the value. We check for this in a simplistic + libgcj.zip in the value. We check for this in a simplistic way. Symlinks will fool this test. This is only used for -MM and -MMD, so it probably isn't terribly important. */ - if (! strcmp (filename, LIBJAVA_ZIP_FILE)) + if (! strcmp (filename, LIBGCJ_ZIP_FILE)) n->flags |= FLAG_SYSTEM; } @@ -220,7 +220,7 @@ jcf_path_init () char *cp; add_entry (&sys_dirs, ".", 0); - add_entry (&sys_dirs, LIBJAVA_ZIP_FILE, 1); + add_entry (&sys_dirs, LIBGCJ_ZIP_FILE, 1); GET_ENV_PATH_LIST (cp, "CLASSPATH"); add_path (&classpath_env, cp, 0); |