Skip to content

Commit 56f0c53

Browse files
Andrew Leonardjerboaa
authored andcommitted
8278163: --with-cacerts-src variable resolved after GenerateCacerts recipe setup
Reviewed-by: sgehwolf Backport-of: 45da3aea22fd85f214e661b2c98631cb91ddb55d
1 parent 0c6e662 commit 56f0c53

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

make/modules/java.base/Gendata.gmk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ TARGETS += $(GENDATA_CURDATA)
6060

6161
################################################################################
6262

63-
GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
63+
ifneq ($(CACERTS_SRC), )
64+
GENDATA_CACERTS_SRC := $(CACERTS_SRC)
65+
else
66+
GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
67+
endif
6468
GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts
6569

6670
$(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)
@@ -71,9 +75,6 @@ $(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)
7175
ifeq ($(CACERTS_FILE), )
7276
TARGETS += $(GENDATA_CACERTS)
7377
endif
74-
ifneq ($(CACERTS_SRC), )
75-
GENDATA_CACERTS_SRC := $(CACERTS_SRC)
76-
endif
7778

7879
################################################################################
7980

0 commit comments

Comments
 (0)