equal
deleted
inserted
replaced
487 # Build into object dir and copy executable afterwards to avoid .ilk file in |
487 # Build into object dir and copy executable afterwards to avoid .ilk file in |
488 # image. The real fix would be clean up linking of unpack200 using |
488 # image. The real fix would be clean up linking of unpack200 using |
489 # -link -incremental:no |
489 # -link -incremental:no |
490 # like all other launchers. |
490 # like all other launchers. |
491 $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE) |
491 $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE) |
492 $(MKDIR) -p $(@D) |
492 $(call install-file) |
493 $(CP) '$<' '$@' |
|
494 |
493 |
495 BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX) |
494 BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX) |
496 |
495 |
497 ########################################################################################## |
496 ########################################################################################## |
498 |
497 |
586 ifeq ($(OPENJDK_TARGET_OS),windows) |
585 ifeq ($(OPENJDK_TARGET_OS),windows) |
587 $(eval $(call SetupLauncher,java-rmi,,\ |
586 $(eval $(call SetupLauncher,java-rmi,,\ |
588 $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU)))) |
587 $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU)))) |
589 else |
588 else |
590 $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh |
589 $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh |
591 $(MKDIR) -p $(@D) |
590 $(call install-file) |
592 $(CP) $< $@ |
|
593 $(CHMOD) a+x $@ |
591 $(CHMOD) a+x $@ |
594 endif |
592 endif |
595 |
593 |
596 ########################################################################################## |
594 ########################################################################################## |
597 # jabswitch |
595 # jabswitch |