Changeset 444


Ignore:
Timestamp:
Aug 25, 2016, 5:01:08 PM (9 years ago)
Author:
dmik
Message:

Fix echo -e issues across different shells on OS/2.

Location:
trunk/openjdk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/corba/make/common/shared/Defs-utils.gmk

    r443 r444  
    167167# OS/2 specific
    168168ifeq ($(PLATFORM),os2)
    169   ECHO   = $(UTILS_COMMAND_PATH)echo -e
     169  # Prefer built-in echo if it does backslash-escaped character
     170  # interpretation (e.g. dash echo does)
     171  ifeq ($(shell V=`echo "foo\tbar"` ; [ "$${\#V}" = 7 ] ; echo $$?), 0)
     172    ECHO = echo
     173  else
     174    ECHO = $(UTILS_COMMAND_PATH)echo -e
     175  endif
    170176  NAWK   = $(UTILS_COMMAND_PATH)awk
    171177endif

  • trunk/openjdk/hotspot/make/os2/makefiles/vm.make

    r339 r444  
    8888Def_File = vm.def
    8989$(Def_File): $(MAKEFILE)
    90         @echo -e 'LIBRARY jvm INITINSTANCE TERMINSTANCE \n \
     90        @printf 'LIBRARY jvm INITINSTANCE TERMINSTANCE \n \
    9191EXPORTS \n \
    9292  _jio_snprintf \n \

  • trunk/openjdk/jdk/make/common/shared/Defs-utils.gmk

    r443 r444  
    189189# OS/2 specific
    190190ifeq ($(PLATFORM),os2)
    191   ECHO   = $(UTILS_COMMAND_PATH)echo -e
     191  # Prefer built-in echo if it does backslash-escaped character
     192  # interpretation (e.g. dash echo does)
     193  ifeq ($(shell V=`echo "foo\tbar"` ; [ "$${\#V}" = 7 ] ; echo $$?), 0)
     194    ECHO = echo
     195  else
     196    ECHO = $(UTILS_COMMAND_PATH)echo -e
     197  endif
    192198  NAWK   = $(UTILS_COMMAND_PATH)awk
    193199endif
Note: See TracChangeset for help on using the changeset viewer.