434 CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ |
434 CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ |
435 LDFLAGS := -nostdlib -r, \ |
435 LDFLAGS := -nostdlib -r, \ |
436 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
436 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
437 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
437 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
438 |
438 |
439 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) |
439 ifeq ($(STATIC_BUILD), true) |
|
440 TARGETS += $(BUILD_LIBJLI_STATIC) |
|
441 else |
|
442 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) |
440 $(call install-file) |
443 $(call install-file) |
441 |
444 |
442 TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a |
445 TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a |
|
446 endif |
443 |
447 |
444 else ifeq ($(OPENJDK_TARGET_OS), aix) |
448 else ifeq ($(OPENJDK_TARGET_OS), aix) |
445 # AIX also requires a static libjli because the compiler doesn't support '-rpath' |
449 # AIX also requires a static libjli because the compiler doesn't support '-rpath' |
446 $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ |
450 $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ |
447 STATIC_LIBRARY := jli_static, \ |
451 STATIC_LIBRARY := jli_static, \ |