diff --git a/jdk/make/launcher/Launcher-jdk.runtime.gmk b/jdk/make/launcher/Launcher-jdk.runtime.gmk
index a8b21fe42e7..af3fc299240 100644
--- a/jdk/make/launcher/Launcher-jdk.runtime.gmk
+++ b/jdk/make/launcher/Launcher-jdk.runtime.gmk
@@ -77,7 +77,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
   EXE_OUT_OPTION := -Fe
   # With the current way unpack200 is built, debug symbols aren't supported
   # anyway.
-  UNPACKEXE_DEBUG_SYMBOLS :=
+  UNPACKEXE_DEBUG_SYMBOLS := false
 endif
 
 # The linker on older SuSE distros (e.g. on SLES 10) complains with:
diff --git a/jdk/make/lib/LibCommon.gmk b/jdk/make/lib/LibCommon.gmk
index eede8fbd8de..fd6e3428715 100644
--- a/jdk/make/lib/LibCommon.gmk
+++ b/jdk/make/lib/LibCommon.gmk
@@ -45,15 +45,17 @@ endif
 # elegant solution to this.
 WIN_JAVA_LIB := $(JDK_OUTPUTDIR)/objs/libjava/java.lib
 
-# Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but
-# not on other platforms.
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  DEBUG_ALL_BINARIES := true
-endif
-
-# Build everything with debugging on OpenJDK
 ifdef OPENJDK
+  # Build everything with debugging on OpenJDK
   DEBUG_ALL_BINARIES := true
+else
+  # Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but
+  # not on other platforms.
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    DEBUG_ALL_BINARIES := true
+  else
+    DEBUG_ALL_BINARIES := false
+  endif
 endif
 
 ################################################################################