Skip to content

Commit

Permalink
8290920: sspi_bridge.dll not built if BUILD_CRYPTO is false
Browse files Browse the repository at this point in the history
Reviewed-by: phh
Backport-of: 5e1e449c116d44fb77a21ce4cd5187cfc55263f2
  • Loading branch information
GoeLin committed Feb 8, 2023
1 parent 7e74421 commit 65180f1
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions make/lib/Lib-java.security.jgss.gmk
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -38,6 +38,19 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJ2GSS, \

TARGETS += $(BUILD_LIBJ2GSS)

ifeq ($(call isTargetOs, windows), true)
$(eval $(call SetupJdkLibrary, BUILD_LIBSSPI_BRIDGE, \
NAME := sspi_bridge, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \
-I$(TOPDIR)/src/java.security.jgss/share/native/libj2gss, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \
))

TARGETS += $(BUILD_LIBSSPI_BRIDGE)
endif

################################################################################

ifneq ($(BUILD_CRYPTO), false)
Expand All @@ -55,17 +68,6 @@ ifneq ($(BUILD_CRYPTO), false)
))

TARGETS += $(BUILD_LIBW2K_LSA_AUTH)

$(eval $(call SetupJdkLibrary, BUILD_LIBSSPI_BRIDGE, \
NAME := sspi_bridge, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \
-I$(TOPDIR)/src/java.security.jgss/share/native/libj2gss, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \
))

TARGETS += $(BUILD_LIBSSPI_BRIDGE)
endif

ifeq ($(call isTargetOs, macosx), true)
Expand Down

1 comment on commit 65180f1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.