make/lib/Lib-java.instrument.gmk

*** 28,38 ****
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
  
  ################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    # equivalent of strcasecmp is stricmp on Windows
    LIBINSTRUMENT_CFLAGS := -Dstrcasecmp=stricmp
    WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
  endif
  
--- 28,38 ----
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
  
  ################################################################################
  
! ifeq ($(call isTargetOs, windows), true)
    # equivalent of strcasecmp is stricmp on Windows
    LIBINSTRUMENT_CFLAGS := -Dstrcasecmp=stricmp
    WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
  endif
  
*** 60,70 ****
          -framework ApplicationServices, \
      LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
          $(WINDOWS_JLI_LIB), \
  ))
  
! ifeq ($(OPENJDK_TARGET_OS), aix)
    $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static)
  else
    $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli)
  endif
  $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java)
--- 60,70 ----
          -framework ApplicationServices, \
      LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
          $(WINDOWS_JLI_LIB), \
  ))
  
! ifeq ($(call isTargetOs, aix), true)
    $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static)
  else
    $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli)
  endif
  $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java)