make/linux/makefiles/defs.make

*** 168,177 ****
--- 168,181 ----
    # up by different parts of the build. Just to be clear, we only need
    # two variable names because the incoming option value can be
    # overridden in some situations, e.g., a BUILD_FLAVOR != product
    # build.
  
+   # Due to the multiple sub-make processes that occur this logic gets
+   # executed multiple times.We reduce the noise by at least checking that
+   # BUILD_FLAVOR has been set.
+   ifneq ($(BUILD_FLAVOR),)
      ifeq ($(BUILD_FLAVOR), product)
        FULL_DEBUG_SYMBOLS ?= 1
        ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
      else
        # debug variants always get Full Debug Symbols (if available)
*** 181,207 ****
      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:
      DEF_OBJCOPY=/usr/bin/objcopy
-     ifdef CROSS_COMPILE_ARCH
-       # don't try to generate .debuginfo files when cross compiling
-       _JUNK_ := $(shell \
-         echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \
-           "skipping .debuginfo generation.")
-       OBJCOPY=
-     else
        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
-     endif
-   else
-     OBJCOPY=
-   endif
  
    ifeq ($(OBJCOPY),)
      _JUNK_ := $(shell \
        echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
      ENABLE_FULL_DEBUG_SYMBOLS=0
--- 185,202 ----
        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),)
          DEF_OBJCOPY=/usr/bin/objcopy
          OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
+       endif
        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.")
          ENABLE_FULL_DEBUG_SYMBOLS=0
*** 229,239 ****
      ZIP_DEBUGINFO_FILES ?= 1
  
      _JUNK_ := $(shell \
        echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
    endif
! endif
  
  JDK_INCLUDE_SUBDIR=linux
  
  # Library suffix
  LIBRARY_SUFFIX=so
--- 224,236 ----
          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
  
  JDK_INCLUDE_SUBDIR=linux
  
  # Library suffix
  LIBRARY_SUFFIX=so