equal
deleted
inserted
replaced
97 $(BUILD_LIBNIO): $(BUILD_LIBNET) |
97 $(BUILD_LIBNIO): $(BUILD_LIBNET) |
98 |
98 |
99 ################################################################################ |
99 ################################################################################ |
100 # Create the macosx security library |
100 # Create the macosx security library |
101 |
101 |
102 ifeq ($(OPENJDK_TARGET_OS), macosx) |
102 ifeq ($(call isTargetOs, macosx), true) |
103 # JavaNativeFoundation framework not supported in static builds |
103 # JavaNativeFoundation framework not supported in static builds |
104 ifneq ($(STATIC_BUILD), true) |
104 ifneq ($(STATIC_BUILD), true) |
105 |
105 |
106 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \ |
106 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \ |
107 NAME := osxsecurity, \ |
107 NAME := osxsecurity, \ |
128 endif |
128 endif |
129 |
129 |
130 ################################################################################ |
130 ################################################################################ |
131 # Create the jsig library |
131 # Create the jsig library |
132 |
132 |
133 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) |
133 ifeq ($(call isTargetOsType, unix), true) |
134 ifeq ($(STATIC_BUILD), false) |
134 ifeq ($(STATIC_BUILD), false) |
135 $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \ |
135 $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \ |
136 NAME := jsig, \ |
136 NAME := jsig, \ |
137 OPTIMIZATION := LOW, \ |
137 OPTIMIZATION := LOW, \ |
138 CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \ |
138 CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \ |
203 endif |
203 endif |
204 |
204 |
205 ################################################################################ |
205 ################################################################################ |
206 # Copy tzmappings file for Windows |
206 # Copy tzmappings file for Windows |
207 |
207 |
208 ifeq ($(OPENJDK_TARGET_OS), windows) |
208 ifeq ($(call isTargetOs, windows), true) |
209 $(eval $(call SetupCopyFiles, COPY_TZMAPPINGS, \ |
209 $(eval $(call SetupCopyFiles, COPY_TZMAPPINGS, \ |
210 FILES := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/windows/conf/tzmappings, \ |
210 FILES := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/windows/conf/tzmappings, \ |
211 DEST := $(call FindLibDirForModule, $(MODULE)), \ |
211 DEST := $(call FindLibDirForModule, $(MODULE)), \ |
212 )) |
212 )) |
213 TARGETS += $(COPY_TZMAPPINGS) |
213 TARGETS += $(COPY_TZMAPPINGS) |