Skip to content

Commit

Permalink
Merge pull request ibmruntimes#277 from keithc-ca/jncrypto
Browse files Browse the repository at this point in the history
Remove definitions of unused make macros
  • Loading branch information
pshipton authored Nov 15, 2023
2 parents 3dfae78 + 5593b24 commit fa90845
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions closed/custom/modules/java.base/Lib.gmk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===========================================================================
# (c) Copyright IBM Corp. 2018, 2020 All Rights Reserved
# (c) Copyright IBM Corp. 2018, 2023 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 All @@ -18,24 +18,17 @@
# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
# ===========================================================================

################################################################################
# Create the Java Native crypto library
ifeq ($(WITH_OPENSSL), yes)
$(eval $(call SetupJdkLibrary, BUILD_JNCRYPTO, \
NAME := jncrypto, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \
-c $(OPENSSL_CFLAGS), \
CFLAGS := $(CFLAGS_JDKLIB) $(OPENSSL_CFLAGS), \
DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough unused-value, \
DISABLED_WARNINGS_clang := sign-compare, \
DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_unix := $(LIBDL), \
))
TARGETS += $(BUILD_JNCRYPTO)
endif

INCLUDE_CUSTOM_EXTENSION_SYMBOLS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$(LIBRARY_PREFIX)jncrypto.symbols
INCLUDE_CUSTOM_EXTENSION_LIB := BUILD_JNCRYPTO
################################################################################

0 comments on commit fa90845

Please sign in to comment.