Skip to content
Permalink
Browse files
8278163: --with-cacerts-src variable resolved after GenerateCacerts r…
…ecipe setup

Reviewed-by: sgehwolf
Backport-of: 45da3aea22fd85f214e661b2c98631cb91ddb55d
  • Loading branch information
Andrew Leonard authored and jerboaa committed Feb 23, 2022
1 parent 0c6e662 commit 56f0c53c59d79a0d6b43b93abc0cf27eab4eac79
Showing 1 changed file with 5 additions and 4 deletions.
@@ -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

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

1 comment on commit 56f0c53

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 56f0c53 Feb 23, 2022

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.