# HG changeset patch
# User sla
# Date 1430937453 -7200
# Node ID 0a794f3b88c95c44779c32775715c4b6fdea041d
# Parent  ed4a9b27a968a443ba67bd002299d8f442775838# Parent  cd5b7fd6c0cf032aa97c225b966db2f3dcefd19a
Merge

diff -r ed4a9b27a968 -r 0a794f3b88c9 jdk/make/lib/Lib-java.management.gmk
--- a/jdk/make/lib/Lib-java.management.gmk	Tue May 05 20:09:52 2015 +0200
+++ b/jdk/make/lib/Lib-java.management.gmk	Wed May 06 20:37:33 2015 +0200
@@ -38,11 +38,6 @@
     $(LIBJAVA_HEADER_FLAGS) \
     #
 
-# In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
-# a binary that is compatible with windows versions older than 7/2008R2.
-# See MSDN documentation for GetProcessMemoryInfo for more information.
-BUILD_LIBMANAGEMENT_CFLAGS += -DPSAPI_VERSION=1
-
 LIBMANAGEMENT_OPTIMIZATION := HIGH
 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
   ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
diff -r ed4a9b27a968 -r 0a794f3b88c9 jdk/make/lib/Lib-jdk.management.gmk
--- a/jdk/make/lib/Lib-jdk.management.gmk	Tue May 05 20:09:52 2015 +0200
+++ b/jdk/make/lib/Lib-jdk.management.gmk	Wed May 06 20:37:33 2015 +0200
@@ -39,6 +39,13 @@
     $(LIBJAVA_HEADER_FLAGS) \
     #
 
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  # In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
+  # a binary that is compatible with windows versions older than 7/2008R2.
+  # See MSDN documentation for GetProcessMemoryInfo for more information.
+  LIBMANAGEMENT_EXT_CFLAGS += -DPSAPI_VERSION=1
+endif
+
 LIBMANAGEMENT_EXT_OPTIMIZATION := HIGH
 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
   ifeq ($(ENABLE_DEBUG_SYMBOLS), true)