comparison make/CreateJmods.gmk @ 53547:fbedca07d49f

8213922: fix ctw stand-alone build Reviewed-by: kvn, roland
author iignatyev
date Thu, 15 Nov 2018 14:01:08 -0800
parents f348e5d4769b 35b22ca681d1
children f9f4afd36064 28094715ae71
comparison
equal deleted inserted replaced
36:9cdde5f8dc45 37:2187f28bff01
119 endif 119 endif
120 else # not java.base 120 else # not java.base
121 ifeq ($(OPENJDK_TARGET_OS), windows) 121 ifeq ($(OPENJDK_TARGET_OS), windows)
122 # Only java.base needs to include the MSVC*_DLLs. Make sure no other module 122 # Only java.base needs to include the MSVC*_DLLs. Make sure no other module
123 # tries to include them (typically imported ones). 123 # tries to include them (typically imported ones).
124 ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCR_DLL))), ) 124 ifneq ($(MSVCR_DLL), )
125 JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))' 125 ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCR_DLL))), )
126 JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))'
127 endif
126 endif 128 endif
127 ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCP_DLL))), ) 129 ifneq ($(MSVCP_DLL), )
128 JMOD_FLAGS += --exclude '$(notdir $(MSVCP_DLL))' 130 ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCP_DLL))), )
131 JMOD_FLAGS += --exclude '$(notdir $(MSVCP_DLL))'
132 endif
133 endif
134 ifneq ($(UCRT_DLL_DIR), )
135 UCRT_DLL_FILES := $(notdir $(wildcard $(UCRT_DLL_DIR)/*.dll))
136 ifneq ($(wildcard $(LIBS_DIR)/$(firstword $(UCRT_DLL_FILES))), )
137 JMOD_FLAGS += $(patsubst %, --exclude '%', $(UCRT_DLL_FILES))
138 endif
129 endif 139 endif
130 endif 140 endif
131 endif 141 endif
132 142
133 # Changes to the jmod tool itself should also trigger a rebuild of all jmods. 143 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.