Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-8023156

make dist-clean should remove javacservers directory

    XMLWordPrintable

Details

    • Bug
    • Status: Resolved
    • P4
    • Resolution: Fixed
    • 8
    • 8
    • infrastructure
    • None
    • 8
    • b104
    • generic
    • generic

    Description

      From ivan.gerasimov@oracle.com on open list:

      Hello!

      When sjavac is enabled, configure creates $OUTPUT_ROOT/javacservers directory.
      However, make dist-clean doesn't remove it.

      Please find a simple fix below.

      Sincerely yours,
      Ivan


      diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
      --- a/common/makefiles/Main.gmk
      +++ b/common/makefiles/Main.gmk
      @@ -204,7 +204,7 @@
       # If the output directory was created by configure and now becomes empty, remove it as well.
       # FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
       dist-clean: clean
      - @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp)
      + @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
           @$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
           if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
               $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ;\

      Attachments

        Activity

          People

            erikj Erik Joelsson
            erikj Erik Joelsson
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: