make/common/NativeCompilation.gmk

rev 2039 : [mq]: 8148244

*** 370,379 ****
--- 370,382 ----
  #       when compiling C code
  #   DISABLED_WARNINGS_CXX_<toolchain> Disable the given warnings for the specified
  #       toolchain when compiling C++ code
  #   STRIP_SYMBOLS Set to true to strip the final binary if the toolchain allows for it
  #   DEBUG_SYMBOLS Set to false to disable generation of debug symbols
+ #   COPY_DEBUG_SYMBOLS Set to false to override global setting of debug symbol copying
+ #   ZIP_EXTERNAL_DEBUG_SYMBOLS Set to false to override global setting of debug symbol
+ #       zipping
  #   CFLAGS_DEBUG_SYMBOLS Overrides the default cflags for enabling debug symbols
  #   CXXFLAGS_DEBUG_SYMBOLS Overrides the default cxxflags for enabling debug symbols
  #   STRIPFLAGS Optionally change the flags given to the strip command
  #   PRECOMPILED_HEADER Header file to use as precompiled header
  #   PRECOMPILED_HEADER_EXCLUDE List of source files that should not use PCH
*** 805,815 ****
    endif
  
    # Need to make sure TARGET is first on list
    $1 := $$($1_TARGET)
  
!   ifeq ($(COPY_DEBUG_SYMBOLS), true)
      ifneq ($$($1_DEBUG_SYMBOLS), false)
        # Only copy debug symbols for dynamic libraries and programs.
        ifeq ($$($1_STATIC_LIBRARY), )
          ifneq ($$($1_OUTPUT_DIR), $$($1_OBJECT_DIR))
            # The dependency on TARGET is needed on windows for debuginfo files
--- 808,826 ----
    endif
  
    # Need to make sure TARGET is first on list
    $1 := $$($1_TARGET)
  
!   ifneq ($$($1_COPY_DEBUG_SYMBOLS), false)
!     $1_COPY_DEBUG_SYMBOLS := $(COPY_DEBUG_SYMBOLS)
!   endif
! 
!   ifneq ($$($1_ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
!     $1_ZIP_EXTERNAL_DEBUG_SYMBOLS := $(ZIP_EXTERNAL_DEBUG_SYMBOLS)
!   endif
! 
!   ifeq ($$($1_COPY_DEBUG_SYMBOLS), true)
      ifneq ($$($1_DEBUG_SYMBOLS), false)
        # Only copy debug symbols for dynamic libraries and programs.
        ifeq ($$($1_STATIC_LIBRARY), )
          ifneq ($$($1_OUTPUT_DIR), $$($1_OBJECT_DIR))
            # The dependency on TARGET is needed on windows for debuginfo files
*** 852,862 ****
          # This dependency dance ensures that debug info files get rebuilt
          # properly if deleted.
          $$($1_TARGET): $$($1_DEBUGINFO_FILES)
          $$($1_DEBUGINFO_FILES): $$($1_ALL_OBJS)
  
!         ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
            $1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz
            $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP))
  
            # The dependency on TARGET is needed for debuginfo files
            # to be rebuilt properly.
--- 863,873 ----
          # This dependency dance ensures that debug info files get rebuilt
          # properly if deleted.
          $$($1_TARGET): $$($1_DEBUGINFO_FILES)
          $$($1_DEBUGINFO_FILES): $$($1_ALL_OBJS)
  
!         ifeq ($$($1_ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
            $1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz
            $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP))
  
            # The dependency on TARGET is needed for debuginfo files
            # to be rebuilt properly.