common/makefiles/NativeCompilation.gmk

*** 301,318 ****
--- 301,324 ----
          $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
      endif
  
      ifneq (,$$($1_DEBUG_SYMBOLS))       
          ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+             ifdef OPENJDK
+                 # Always add debug symbols
+                 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+                 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
+             else
                  # Programs don't get the debug symbols added in the old build. It's not clear if
                  # this is intentional.
                  ifeq ($$($1_PROGRAM),)
                      $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
                      $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
                  endif
              endif
          endif
+     endif
  
      ifeq ($$($1_CXXFLAGS),)
          $1_CXXFLAGS:=$$($1_CFLAGS)
      endif
      ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)