68 |
68 |
69 ########################################################################################## |
69 ########################################################################################## |
70 # |
70 # |
71 # Windows specific binary security packages. |
71 # Windows specific binary security packages. |
72 # |
72 # |
73 ifeq ($(OPENJDK_TARGET_OS), windows) |
73 ifeq ($(call isTargetOs, windows), true) |
74 # sec-windows-bin.zip is used by builds where the corresponding sources are not available |
74 # sec-windows-bin.zip is used by builds where the corresponding sources are not available |
75 $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \ |
75 $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \ |
76 SRC := $(JDK_OUTPUTDIR), \ |
76 SRC := $(JDK_OUTPUTDIR), \ |
77 INCLUDES := modules/java.security.jgss/sun/security/krb5/internal/tools, \ |
77 INCLUDES := modules/java.security.jgss/sun/security/krb5/internal/tools, \ |
78 ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip)) |
78 ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip)) |
79 |
79 |
80 TARGETS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip |
80 TARGETS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip |
81 |
81 |
82 # JGSS files contain the native Kerberos library |
82 # JGSS files contain the native Kerberos library |
83 ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
83 ifeq ($(call isTargetCpu, x86_64), true) |
84 JGSS_ZIP_NAME = jgss-windows-x64-bin.zip |
84 JGSS_ZIP_NAME = jgss-windows-x64-bin.zip |
85 else |
85 else |
86 JGSS_ZIP_NAME = jgss-windows-i586-bin.zip |
86 JGSS_ZIP_NAME = jgss-windows-i586-bin.zip |
87 endif |
87 endif |
88 |
88 |