mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-12 12:29:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: sgehwolf
Backport-of: 45da3aea22
This commit is contained in:
Andrew Leonard
2022-02-23 19:24:17 +00:00
committed by Vitaly Provodin
parent 2523e70ff6
commit d5b5130b62
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,11 @@ TARGETS += $(GENDATA_CURDATA)
################################################################################ ################################################################################
ifneq ($(CACERTS_SRC), )
GENDATA_CACERTS_SRC := $(CACERTS_SRC)
else
GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/ GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
endif
GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts
$(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*) $(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), ) ifeq ($(CACERTS_FILE), )
TARGETS += $(GENDATA_CACERTS) TARGETS += $(GENDATA_CACERTS)
endif endif
ifneq ($(CACERTS_SRC), )
GENDATA_CACERTS_SRC := $(CACERTS_SRC)
endif
################################################################################ ################################################################################