stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8278163: --with-cacerts-src variable resolved after GenerateCacerts recipe setup

Browse Source 
Reviewed-by: ihse
This commit is contained in:
Andrew Leonard 2021-12-03 08:28:37 +00:00
parent 890700320a
commit 45da3aea22
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make/modules/java.base/Gendata.gmk
View File

@ -60,7 +60,11 @@ TARGETS += $(GENDATA_CURDATA)
################################################################################
GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
ifneq ($(CACERTS_SRC), )
GENDATA_CACERTS_SRC := $(CACERTS_SRC)
else
GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
endif
GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts
$(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)
@ -71,9 +75,6 @@ $(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)
ifeq ($(CACERTS_FILE), )
TARGETS += $(GENDATA_CACERTS)
endif
ifneq ($(CACERTS_SRC), )
GENDATA_CACERTS_SRC := $(CACERTS_SRC)
endif
################################################################################