equal
deleted
inserted
replaced
116 JMOD_FLAGS += --module-path $(JMODS_DIR) \ |
116 JMOD_FLAGS += --module-path $(JMODS_DIR) \ |
117 --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)' |
117 --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)' |
118 endif |
118 endif |
119 endif |
119 endif |
120 else # not java.base |
120 else # not java.base |
121 ifeq ($(OPENJDK_TARGET_OS), windows) |
121 ifeq ($(call isTargetOs, windows), true) |
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 ($(MSVCR_DLL), ) |
124 ifneq ($(MSVCR_DLL), ) |
125 ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCR_DLL))), ) |
125 ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCR_DLL))), ) |
126 JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))' |
126 JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))' |