Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Select the appropriate OpenSSL build target on AIX #818

Merged
merged 1 commit into from
Oct 3, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions closed/openssl.gmk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===========================================================================
# (c) Copyright IBM Corp. 2018, 2023 All Rights Reserved
# (c) Copyright IBM Corp. 2018, 2024 All Rights Reserved
# ===========================================================================
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
Expand Down Expand Up @@ -63,7 +63,11 @@ endif # windows
# Identify the desired openssl target configuration.
OPENSSL_TARGET :=
ifeq ($(OPENJDK_TARGET_OS), aix)
OPENSSL_TARGET := aix64-cc
ifeq ($(TOOLCHAIN_TYPE), clang)
OPENSSL_TARGET := aix64-clang
else ifeq ($(TOOLCHAIN_TYPE), xlc)
OPENSSL_TARGET := aix64-cc
endif
else ifeq ($(OPENJDK_TARGET_OS), linux)
ifneq (,$(filter aarch64 ppc64le x86_64, $(OPENJDK_TARGET_CPU)))
OPENSSL_TARGET := linux-$(OPENJDK_TARGET_CPU)
Expand Down