From d6eb6a5be4aba451e79a0ec416115afe1d90afef Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Mon, 1 Nov 2010 10:12:48 -0700 Subject: [PATCH] 6995674: (launcher) make of jli fails on windows if directory exists Reviewed-by: darcy, ohair --- jdk/make/java/jli/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/jdk/make/java/jli/Makefile b/jdk/make/java/jli/Makefile index 40ddc17e358..9c1b9bc7c83 100644 --- a/jdk/make/java/jli/Makefile +++ b/jdk/make/java/jli/Makefile @@ -148,14 +148,9 @@ include $(BUILDDIR)/common/Library.gmk # ifeq ($(PLATFORM), windows) -STATIC_LIBRARY_DIR = $(OBJDIR)/static -STATIC_LIBRARY_NAME = $(LIBPREFIX)$(LIBRARY).lib -STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME) +STATIC_LIBRARY = $(OBJDIR)/static/$(LIBPREFIX)$(LIBRARY).lib -$(STATIC_LIBRARY_DIR): $(OBJDIR) - @$(MKDIR) $(STATIC_LIBRARY_DIR) - -$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR) +$(STATIC_LIBRARY): $(FILES_o) @$(prep-target) $(LIBEXE) -nologo -out:$@ $(FILES_o)