< prev index next >

make/ZipSecurity.gmk

Print this page

        

@@ -68,21 +68,21 @@
 
 ##########################################################################################
 #
 # Windows specific binary security packages.
 #
-ifeq ($(call isTargetOs, windows), true)
+ifeq ($(OPENJDK_TARGET_OS), windows)
   # sec-windows-bin.zip is used by builds where the corresponding sources are not available
   $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \
       SRC := $(JDK_OUTPUTDIR), \
       INCLUDES := modules/java.security.jgss/sun/security/krb5/internal/tools, \
       ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip))
 
   TARGETS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
 
   # JGSS files contain the native Kerberos library
-  ifeq ($(call isTargetCpu, x86_64), true)
+  ifeq ($(OPENJDK_TARGET_CPU), x86_64)
     JGSS_ZIP_NAME = jgss-windows-x64-bin.zip
   else
     JGSS_ZIP_NAME = jgss-windows-i586-bin.zip
   endif
 
< prev index next >