make/linux/makefiles/defs.make

*** 26,35 ****
--- 26,41 ----
  # Include the top level defs.make under make directory instead of this one.
  # This file is included into make/defs.make.
  
  SLASH_JAVA ?= /java
  
+ define print_info
+   ifneq ($$(LOG_LEVEL), warn)
+     $$(shell echo >&2 "INFO: $1")
+   endif
+ endef
+ 
  # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
  
  # ARCH can be set explicitly in spec.gmk
  ifndef ARCH
    ARCH := $(shell uname -m)
*** 183,194 ****
        ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
      else
        # debug variants always get Full Debug Symbols (if available)
        ENABLE_FULL_DEBUG_SYMBOLS = 1
      endif
!     _JUNK_ := $(shell \
!       echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
      # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
  
      ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
        # Default OBJCOPY comes from GNU Binutils on Linux
        ifeq ($(CROSS_COMPILE_ARCH),)
--- 189,199 ----
        ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
      else
        # debug variants always get Full Debug Symbols (if available)
        ENABLE_FULL_DEBUG_SYMBOLS = 1
      endif
!     $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
      # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
  
      ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
        # Default OBJCOPY comes from GNU Binutils on Linux
        ifeq ($(CROSS_COMPILE_ARCH),)
*** 199,221 ****
            DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy
          endif
        endif
        OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
        ifneq ($(ALT_OBJCOPY),)
!         _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
          OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
        endif
  
        ifeq ($(OBJCOPY),)
!         _JUNK_ := $(shell \
!           echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
          ENABLE_FULL_DEBUG_SYMBOLS=0
!         _JUNK_ := $(shell \
!           echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
        else
!         _JUNK_ := $(shell \
!           echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
  
          # Library stripping policies for .debuginfo configs:
          #   all_strip - strips everything from the library
          #   min_strip - strips most stuff from the library; leaves minimum symbols
          #   no_strip  - does not strip the library at all
--- 204,223 ----
            DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy
          endif
        endif
        OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
        ifneq ($(ALT_OBJCOPY),)
!         $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)"))
          OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
        endif
  
        ifeq ($(OBJCOPY),)
!         $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY."))
          ENABLE_FULL_DEBUG_SYMBOLS=0
!         $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
        else
!         $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files."))
  
          # Library stripping policies for .debuginfo configs:
          #   all_strip - strips everything from the library
          #   min_strip - strips most stuff from the library; leaves minimum symbols
          #   no_strip  - does not strip the library at all
*** 225,241 ****
          #
          # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
          #
          STRIP_POLICY ?= min_strip
  
!         _JUNK_ := $(shell \
!           echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
  
          ZIP_DEBUGINFO_FILES ?= 1
  
!         _JUNK_ := $(shell \
!           echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
        endif
      endif # ENABLE_FULL_DEBUG_SYMBOLS=1
    endif # BUILD_FLAVOR
  endif # JDK_6_OR_EARLIER
  
--- 227,241 ----
          #
          # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
          #
          STRIP_POLICY ?= min_strip
  
!         $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)"))
  
          ZIP_DEBUGINFO_FILES ?= 1
  
!         $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
        endif
      endif # ENABLE_FULL_DEBUG_SYMBOLS=1
    endif # BUILD_FLAVOR
  endif # JDK_6_OR_EARLIER