bughz/sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conditionalize rpaths

Browse Source
This commit is contained in:
Doug MacEachern 2006-12-10 03:45:23 +00:00
parent b2cfaa6ccb
commit a2ddc92363
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bindings/java/src/org/hyperic/sigar/vmware/VMControlLibrary.java
View File

@ -242,18 +242,32 @@ public class VMControlLibrary {
}
//create vmcontrol.so from vmcontrol.o
String[] link_args = {
GCC,
"-shared",
"-o", out.getPath(),
obj.getPath(),
"-Wl,-rpath", libssl.getParent(),
libssl.getPath(),
"-Wl,-rpath", libcrypto.getParent(),
libcrypto.getPath()
};
List link_args = new ArrayList();
exec(link_args);
link_args.add(GCC);
link_args.add("-shared");
link_args.add("-o");
link_args.add(out.getPath());
link_args.add(obj.getPath());
//Skip rpath for ESX 3.x
if (!new File(libssl.getParent(), "libc.so.6").exists()) {
final String rpath = "-Wl,-rpath";
link_args.add(rpath);
link_args.add(libssl.getParent());
//check if libcrypto is in a different directory
if (!libssl.getParent().equals(libcrypto.getParent())) {
link_args.add(rpath);
link_args.add(libcrypto.getParent());
}
}
link_args.add(libssl.getPath());
link_args.add(libcrypto.getPath());
exec((String[])link_args.toArray(new String[0]));
setSharedLibrary(out.getPath());
}