mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-21 03:24:38 +02:00
8066474: Remove the lib/ directory from Linux and Solaris images
Reviewed-by: tbell, ihse
This commit is contained in:
parent
fdedfbc0f3
commit
1ba6d00a72
14 changed files with 57 additions and 103 deletions
|
@ -150,22 +150,6 @@ IsJavaw()
|
|||
return _isjavaw;
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns the arch path, to get the current arch use the
|
||||
* macro GetArch, nbits here is ignored for now.
|
||||
*/
|
||||
const char *
|
||||
GetArchPath(int nbits)
|
||||
{
|
||||
#ifdef _M_AMD64
|
||||
return "amd64";
|
||||
#elif defined(_M_IA64)
|
||||
return "ia64";
|
||||
#else
|
||||
return "i386";
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
@ -207,8 +191,8 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
|
|||
exit(2);
|
||||
}
|
||||
|
||||
JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%s%s%sjvm.cfg",
|
||||
jrepath, FILESEP, FILESEP, (char*)GetArch(), FILESEP);
|
||||
JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%sjvm.cfg",
|
||||
jrepath, FILESEP, FILESEP);
|
||||
|
||||
/* Find the specified JVM type */
|
||||
if (ReadKnownVMs(jvmcfg, JNI_FALSE) < 1) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue