changeset 53346:61866ba87b31

8217044: [aix] Launcher still adds old path to jli library to LIBPATH Reviewed-by: ihse, rriggs, dholmes
author goetz
date Tue, 15 Jan 2019 12:02:40 +0100
parents 91ab128a65a3
children 6bd052801d02
files src/java.base/unix/native/libjli/java_md_solinux.c
diffstat 1 files changed, 1 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/unix/native/libjli/java_md_solinux.c	Wed Jan 16 10:16:08 2019 +0100
+++ b/src/java.base/unix/native/libjli/java_md_solinux.c	Tue Jan 15 12:02:40 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -374,10 +374,6 @@
             char *new_jvmpath = JLI_StringDup(jvmpath);
             new_runpath_size = ((runpath != NULL) ? JLI_StrLen(runpath) : 0) +
                     2 * JLI_StrLen(jrepath) +
-#ifdef AIX
-                    /* On AIX we additionally need 'jli' in the path because ld doesn't support $ORIGIN. */
-                    JLI_StrLen(jrepath) + JLI_StrLen("/lib//jli:") +
-#endif
                     JLI_StrLen(new_jvmpath) + 52;
             new_runpath = JLI_MemAlloc(new_runpath_size);
             newpath = new_runpath + JLI_StrLen(LD_LIBRARY_PATH "=");
@@ -395,15 +391,9 @@
                 sprintf(new_runpath, LD_LIBRARY_PATH "="
                         "%s:"
                         "%s/lib:"
-#ifdef AIX
-                        "%s/lib/jli:" /* Needed on AIX because ld doesn't support $ORIGIN. */
-#endif
                         "%s/../lib",
                         new_jvmpath,
                         jrepath,
-#ifdef AIX
-                        jrepath,
-#endif
                         jrepath
                         );