make/lib/CoreLibraries.gmk

*** 303,313 ****
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_SUFFIX_linux := -ljvm -ljava, \
      LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lc, \
      LDFLAGS_SUFFIX_aix := -ljvm -ljava, \
!     LDFLAGS_SUFFIX_windows := advapi32.lib, \
      LDFLAGS_SUFFIX_macosx := -ljvm -framework CoreFoundation, \
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=prefs.dll" \
          -D "JDK_INTERNAL_NAME=prefs" \
--- 303,313 ----
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_SUFFIX_linux := -ljvm -ljava, \
      LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lc, \
      LDFLAGS_SUFFIX_aix := -ljvm -ljava, \
!     LDFLAGS_SUFFIX_windows := advapi32.lib jvm.lib $(WIN_JAVA_LIB), \
      LDFLAGS_SUFFIX_macosx := -ljvm -framework CoreFoundation, \
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=prefs.dll" \
          -D "JDK_INTERNAL_NAME=prefs" \