diff options
| author | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-10 05:32:49 +0000 |
|---|---|---|
| committer | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-10 05:32:49 +0000 |
| commit | da538d34f54a3f1c4407d8ad7b21094501c5c180 (patch) | |
| tree | 3ba705331b477782724956856cd993cf566c0995 /gcc/java/jcf-path.c | |
| parent | 0d50e69a939bc73845dec8af0c81dee426d15632 (diff) | |
| download | gcc-da538d34f54a3f1c4407d8ad7b21094501c5c180.tar.gz | |
Top level ChangeLog:
2000-12-09 Alexandre Petit-Bianco <apbianco@cygnus.com>
* libjava: Imported from /cvs/java.
* libffi: Likewise.
* Boehm-gc: Likewise.
libjava/ChangeLog:
2000-12-09 Alexandre Petit-Bianco <apbianco@cygnus.com>
* Makefile.am (data_DATA): libgcj.jar replaces libgcj.zip.
(ZIP): Points at fastjar instead of zip.
(libgcj_la_DEPENDENCIES): libgcj.jar replaces libgcj.zip.
(libgcj_la_LDFLAGS): Correctly point at libsupc++.
(libgcjx_la_DEPENDENCIES): libgcj.jar replaces libgcj.zip.
(libgcjx_la_LDFLAGS): Correctly point at libsupc++.
($(java_source_files:.java=.class):): libgcj.jar replaces libgcj.zip.
($(x_java_source_files:.java=.class):): Likewise.
(libgcj.jar:): Replaces libgcj.zip:, builds libgcj.jar and uses
fastar's flags.
(CLEANFILES): libgcj.jar replaces libgcj.zip.
(java/lang/ClassLoader.h:): Depends on libgcj.jar.
(gnu/gcj/runtime/FirstThread.h:, java/lang/Thread.h:,
java/lang/String.h:, java/lang/reflect/Constructor.h:,
java/lang/reflect/Field.h:, java/lang/reflect/Method.h:,
gnu/gcj/runtime/VMClassLoader.h:,
java/io/ObjectInputStream$$GetField.h:,
java/io/ObjectOutputStream$$PutField.h:, header-check:): Likewise.
(Makefile.in): Rebuilt.
gcc/java/ChangeLog:
2000-12-09 Alexandre Petit-Bianco <apbianco@cygnus.com>
* Make-lang.in (java/jcf-path.o:): libgcj.jar replaces libgcj.zip.
jcf-path.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38167 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/jcf-path.c')
| -rw-r--r-- | gcc/java/jcf-path.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/java/jcf-path.c b/gcc/java/jcf-path.c index 3e63bc5b988..a9e1bda70aa 100644 --- a/gcc/java/jcf-path.c +++ b/gcc/java/jcf-path.c @@ -69,7 +69,7 @@ static void add_path PARAMS ((struct entry **, const char *, int)); /* We support several different ways to set the class path. - built-in system directory (only libgcj.zip) + built-in system directory (only libgcj.jar) CLASSPATH environment variable -CLASSPATH overrides CLASSPATH -classpath option - overrides CLASSPATH, -CLASSPATH, and built-in @@ -155,7 +155,7 @@ add_entry (entp, filename, is_system) { n->flags |= FLAG_ZIP; /* If the user uses -classpath then he'll have to include - libgcj.zip in the value. We check for this in a simplistic + libgcj.jar 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, LIBGCJ_ZIP_FILE)) @@ -254,7 +254,7 @@ jcf_path_init () strcpy (try + len, "share"); strcat (try, sep); - strcat (try, "libgcj.zip"); + strcat (try, "libgcj.jar"); if (! stat (try, &stat_b)) { add_entry (&sys_dirs, try, 1); @@ -266,7 +266,7 @@ jcf_path_init () strcat (try, sep); strcat (try, "share"); strcat (try, sep); - strcat (try, "libgcj.zip"); + strcat (try, "libgcj.jar"); if (! stat (try, &stat_b)) { add_entry (&sys_dirs, try, 1); |