make/lib/CoreLibraries.gmk

*** 434,447 ****
--- 434,451 ----
        CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
        LDFLAGS := -nostdlib -r, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
+   ifeq ($(BUILD_STATIC), true)
+     TARGETS += $(BUILD_LIBJLI_STATIC)
+   else
      $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC)
          $(call install-file)
  
      TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a
+   endif
  
  else ifeq ($(OPENJDK_TARGET_OS), aix)
    # AIX also requires a static libjli because the compiler doesn't support '-rpath'
    $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
        STATIC_LIBRARY := jli_static, \