diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-10-24 18:03:33 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-10-24 18:03:33 +0000 |
| commit | 54df2ab823c74e470e2ece7c33d8a8f9f7ba6176 (patch) | |
| tree | 6fade324acd4fb38672c5eaf13ffc2a72f2afd42 /tools | |
| parent | 83edeaa6f879addbc83c61aee48264b89661dda1 (diff) | |
| download | classpath-54df2ab823c74e470e2ece7c33d8a8f9f7ba6176.tar.gz | |
2006-10-24 Thomas Fitzsimmons <fitzsim@redhat.com>
* tools/Makefile.am: Add ASM_JAR define to each tool's CFLAGS.
* tools/toolwrapper.c (main): Set bootclasspath, not classpath.
Add ASM_JAR to bootclasspath.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 36 | ||||
| -rw-r--r-- | tools/toolwrapper.c | 2 |
2 files changed, 25 insertions, 13 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index ec1a13483..c82f580d2 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -40,63 +40,75 @@ AM_CPPFLAGS = -Wall \ gappletviewer_SOURCES = toolwrapper.c gappletviewer_CFLAGS = \ -DTOOLPACKAGE="\"appletviewer\"" \ - -DTOOLNAME="\"gappletviewer\"" + -DTOOLNAME="\"gappletviewer\"" \ + -DASM_JAR="" gjarsigner_SOURCES = toolwrapper.c gjarsigner_CFLAGS = \ -DTOOLPACKAGE="\"jarsigner\"" \ - -DTOOLNAME="\"gjarsigner\"" + -DTOOLNAME="\"gjarsigner\"" \ + -DASM_JAR="" gkeytool_SOURCES = toolwrapper.c gkeytool_CFLAGS = \ -DTOOLPACKAGE="\"keytool\"" \ - -DTOOLNAME="\"gkeytool\"" + -DTOOLNAME="\"gkeytool\"" \ + -DASM_JAR="" gjar_SOURCES = toolwrapper.c gjar_CFLAGS = \ -DTOOLPACKAGE="\"jar\"" \ - -DTOOLNAME="\"gjar\"" + -DTOOLNAME="\"gjar\"" \ + -DASM_JAR="" gnative2ascii_SOURCES = toolwrapper.c gnative2ascii_CFLAGS = \ -DTOOLPACKAGE="\"native2ascii\"" \ - -DTOOLNAME="\"gnative2ascii\"" + -DTOOLNAME="\"gnative2ascii\"" \ + -DASM_JAR="" gserialver_SOURCES = toolwrapper.c gserialver_CFLAGS = \ -DTOOLPACKAGE="\"serialver\"" \ - -DTOOLNAME="\"gserialver\"" + -DTOOLNAME="\"gserialver\"" \ + -DASM_JAR="" grmiregistry_SOURCES = toolwrapper.c grmiregistry_CFLAGS = \ -DTOOLPACKAGE="\"rmiregistry\"" \ - -DTOOLNAME="\"grmiregistry\"" + -DTOOLNAME="\"grmiregistry\"" \ + -DASM_JAR="" gtnameserv_SOURCES = toolwrapper.c gtnameserv_CFLAGS = \ -DTOOLPACKAGE="\"tnameserv\"" \ - -DTOOLNAME="\"gtnameserv\"" + -DTOOLNAME="\"gtnameserv\"" \ + -DASM_JAR="" gorbd_SOURCES = toolwrapper.c gorbd_CFLAGS = \ -DTOOLPACKAGE="\"orbd\"" \ - -DTOOLNAME="\"gorbd\"" + -DTOOLNAME="\"gorbd\"" \ + -DASM_JAR="" grmid_SOURCES = toolwrapper.c grmid_CFLAGS = \ -DTOOLPACKAGE="\"rmid\"" \ - -DTOOLNAME="\"grmid\"" + -DTOOLNAME="\"grmid\"" \ + -DASM_JAR="" if USE_ASM gjavah_SOURCES = toolwrapper.c gjavah_CFLAGS = \ -DTOOLPACKAGE="\"javah\"" \ - -DTOOLNAME="\"gjavah\"" + -DTOOLNAME="\"gjavah\"" \ + -DASM_JAR="\":$(PATH_TO_ASM)\"" grmic_SOURCES = toolwrapper.c grmic_CFLAGS = \ -DTOOLPACKAGE="\"rmic\"" \ - -DTOOLNAME="\"grmic\"" + -DTOOLNAME="\"grmic\"" \ + -DASM_JAR="\":$(PATH_TO_ASM)\"" endif else diff --git a/tools/toolwrapper.c b/tools/toolwrapper.c index 9f4720ab9..dd23286c3 100644 --- a/tools/toolwrapper.c +++ b/tools/toolwrapper.c @@ -136,7 +136,7 @@ main (int argc, const char** argv) goto destroy; } - vm_args.options[vm_args.nOptions++].optionString = "-Djava.class.path=" TOOLS_ZIP; + vm_args.options[vm_args.nOptions++].optionString = "-Xbootclasspath/p:" TOOLS_ZIP ASM_JAR; } /* Terminate vm_args.options with a NULL element. */ |