update

taoliult · Nov 14, 2023 · 401337c · 401337c
1 parent 194ecc5
commit 401337c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/closed/custom/modules/java.base/Copy.gmk b/closed/custom/modules/java.base/Copy.gmk
@@ -245,7 +245,7 @@ endif # OPENSSL_BUNDLE_LIB_PATH
 ################################################################################
 # Copy the nss.fips.cfg only on x86/p/z linux
 
-ifneq ($(filter linux-x86 linux-ppc64le linux-s390x, $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU)), ) 
+ifneq ($(filter linux-x86_64 linux-ppc64le linux-s390x, $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU)), ) 
   NSS_FIPS_CFG_SRC := $(TOPDIR)/closed/src/java.base/share/conf/security/nss.fips.cfg
   NSS_FIPS_CFG_DST := $(CONF_DST_DIR)/security/nss.fips.cfg
 

diff --git a/make/jdk/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java b/make/jdk/src/classes/build/tools/makejavasecurity/MakeJavaSecurity.java
@@ -115,7 +115,10 @@ public static void main(String[] args) throws Exception {
                 }
                 iter.remove();
             } else if (line.startsWith("#if defined ")) {
+                System.out.println("TAO DEBUG - args[2]: " + args[2]);
+                System.out.println("TAO DEBUG - args[3]: " + args[3]);
                 for (String l : line.split("\\|\\|")) {
+                    System.out.println("TAO DEBUG - l: " + l);
                     if (l.indexOf('-') > 0) {
                         mode = l.trim().endsWith(args[2] + "-" + args[3]) ? 1 : 2;
                     } else {