From 8675526cf899c286fc0f1785bca413e5c22cc3f2 Mon Sep 17 00:00:00 2001
From: Tao Liu <tao.liu@ibm.com>
Date: Tue, 7 Nov 2023 10:19:48 -0500
Subject: [PATCH] Change ICC destination folder from lib/icc to lib on Aix

---
 closed/make/modules/openjceplus/Copy.gmk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/closed/make/modules/openjceplus/Copy.gmk b/closed/make/modules/openjceplus/Copy.gmk
index 38071007de4..6343720e4d3 100644
--- a/closed/make/modules/openjceplus/Copy.gmk
+++ b/closed/make/modules/openjceplus/Copy.gmk
@@ -33,10 +33,15 @@ ifeq (true,$(BUILD_JGSKIT))
 
   # Bundle GSKIT library
   ICC_DIR := $(GSKIT_HOME)/lib64
+  ICC_DEST_DIR := $(LIB_DST_DIR)/icc
+
+  ifeq ($(OPENJDK_TARGET_OS), aix)
+      ICC_DEST_DIR := $(LIB_DST_DIR)
+  endif # OPENJDK_TARGET_OS
 
   $(eval $(call SetupCopyFiles, COPY_ICC, \
       SRC := $(ICC_DIR), \
-      DEST := $(LIB_DST_DIR)/icc, \
+      DEST := $(ICC_DEST_DIR), \
       FILES := $(call FindFiles, $(ICC_DIR)), \
   ))