jdk/make/lib/Lib-jdk.jdwp.agent.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 77,96 ****
      LIBRARY := jdwp, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
      SRC := $(LIBJDWP_SRC), \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
!         $(LIBJDWP_CPPFLAGS) \
          -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(JDKLIB_LIBS), \
      LIBS_linux := $(LIBDL), \
      LIBS_solaris := $(LIBDL), \
!     LIBS_macosx := -liconv, \
!     LIBS_aix := -liconv, \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=jdwp.dll" \
          -D "JDK_INTERNAL_NAME=jdwp" \
          -D "JDK_FTYPE=0x2L", \
--- 77,96 ----
      LIBRARY := jdwp, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
      SRC := $(LIBJDWP_SRC), \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
!         $(LIBJDWP_CPPFLAGS) $(ICONV_CFLAGS) \
          -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(JDKLIB_LIBS), \
      LIBS_linux := $(LIBDL), \
      LIBS_solaris := $(LIBDL), \
!     LIBS_macosx := $(ICONV_LIBS), \
!     LIBS_aix := $(ICONV_LIBS), \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=jdwp.dll" \
          -D "JDK_INTERNAL_NAME=jdwp" \
          -D "JDK_FTYPE=0x2L", \