Skip to content

Commit 5e1e449

Browse files
committedSep 28, 2022
8290920: sspi_bridge.dll not built if BUILD_CRYPTO is false
Reviewed-by: valeriep, erikj, ihse, wetmore
1 parent d827fd8 commit 5e1e449

File tree

1 file changed

+14
-12
lines changed
  • make/modules/java.security.jgss

1 file changed

+14
-12
lines changed
 

‎make/modules/java.security.jgss/Lib.gmk

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,19 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJ2GSS, \
4040

4141
TARGETS += $(BUILD_LIBJ2GSS)
4242

43+
ifeq ($(call isTargetOs, windows), true)
44+
$(eval $(call SetupJdkLibrary, BUILD_LIBSSPI_BRIDGE, \
45+
NAME := sspi_bridge, \
46+
OPTIMIZATION := LOW, \
47+
CFLAGS := $(CFLAGS_JDKLIB) \
48+
-I$(TOPDIR)/src/java.security.jgss/share/native/libj2gss, \
49+
LDFLAGS := $(LDFLAGS_JDKLIB) \
50+
$(call SET_SHARED_LIBRARY_ORIGIN) \
51+
))
52+
53+
TARGETS += $(BUILD_LIBSSPI_BRIDGE)
54+
endif
55+
4356
################################################################################
4457

4558
ifneq ($(BUILD_CRYPTO), false)
@@ -57,17 +70,6 @@ ifneq ($(BUILD_CRYPTO), false)
5770
))
5871

5972
TARGETS += $(BUILD_LIBW2K_LSA_AUTH)
60-
61-
$(eval $(call SetupJdkLibrary, BUILD_LIBSSPI_BRIDGE, \
62-
NAME := sspi_bridge, \
63-
OPTIMIZATION := LOW, \
64-
CFLAGS := $(CFLAGS_JDKLIB) \
65-
-I$(TOPDIR)/src/java.security.jgss/share/native/libj2gss, \
66-
LDFLAGS := $(LDFLAGS_JDKLIB) \
67-
$(call SET_SHARED_LIBRARY_ORIGIN) \
68-
))
69-
70-
TARGETS += $(BUILD_LIBSSPI_BRIDGE)
7173
endif
7274

7375
ifeq ($(call isTargetOs, macosx), true)

0 commit comments

Comments
 (0)
Please sign in to comment.