diff options
| author | rriggs <none@none> | 2015-06-20 10:03:42 -0400 |
|---|---|---|
| committer | rriggs <none@none> | 2015-06-20 10:03:42 -0400 |
| commit | c325993db6548faca23bcc8e1cd982b297b18eb7 (patch) | |
| tree | 1134c4b68d5811af67b00f1768b8295a751fb2a5 /make | |
| parent | c35024d14afeac93b3fdd356cb308b5020dea792 (diff) | |
| download | jdk8u_jdk-c325993db6548faca23bcc8e1cd982b297b18eb7.tar.gz | |
8066504: GetVersionEx in java.base/windows/native/libjava/java_props_md.c might not get correct Windows version 0
Summary: System property os.name and os.version should report the version of kernel32.dll
Reviewed-by: alanb, igerasim
Diffstat (limited to 'make')
| -rw-r--r-- | make/lib/CoreLibraries.gmk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk index a36bf90b93..758fa8e59b 100644 --- a/make/lib/CoreLibraries.gmk +++ b/make/lib/CoreLibraries.gmk @@ -207,7 +207,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \ LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \ jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \ shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \ - advapi32.lib, \ + advapi32.lib version.lib, \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ -D "JDK_FNAME=java.dll" \ |