Skip to content

Commit 8e2f053

Browse files
authored
Merge pull request ibmruntimes#391 from keithc-ca/aix_openssl
Select the appropriate OpenSSL build target on AIX
2 parents 427222d + 364fec6 commit 8e2f053

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

closed/openssl.gmk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# (c) Copyright IBM Corp. 2018, 2023 All Rights Reserved
2+
# (c) Copyright IBM Corp. 2018, 2024 All Rights Reserved
33
# ===========================================================================
44
# This code is free software; you can redistribute it and/or modify it
55
# under the terms of the GNU General Public License version 2 only, as
@@ -63,7 +63,11 @@ endif # windows
6363
# Identify the desired openssl target configuration.
6464
OPENSSL_TARGET :=
6565
ifeq ($(OPENJDK_TARGET_OS), aix)
66-
OPENSSL_TARGET := aix64-cc
66+
ifeq ($(TOOLCHAIN_TYPE), clang)
67+
OPENSSL_TARGET := aix64-clang
68+
else ifeq ($(TOOLCHAIN_TYPE), xlc)
69+
OPENSSL_TARGET := aix64-cc
70+
endif
6771
else ifeq ($(OPENJDK_TARGET_OS), linux)
6872
ifneq (,$(filter aarch64 ppc64le x86_64, $(OPENJDK_TARGET_CPU)))
6973
OPENSSL_TARGET := linux-$(OPENJDK_TARGET_CPU)

0 commit comments

Comments
 (0)