make/lib/Lib-jdk.attach.gmk

*** 34,48 ****
    LIBATTACH_CFLAGS := -DPSAPI_VERSION=1
  endif
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBATTACH, \
      NAME := attach, \
-     SRC := $(call FindSrcDirsForLib, jdk.attach, attach), \
      OPTIMIZATION := LOW, \
!     CFLAGS := $(CFLAGS_JDKLIB) \
!         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.attach \
!         $(LIBJAVA_HEADER_FLAGS) $(LIBATTACH_CFLAGS), \
      CFLAGS_windows := /Gy, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(JDKLIB_LIBS), \
      LIBS_solaris := -ldoor, \
--- 34,45 ----
    LIBATTACH_CFLAGS := -DPSAPI_VERSION=1
  endif
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBATTACH, \
      NAME := attach, \
      OPTIMIZATION := LOW, \
!     CFLAGS := $(CFLAGS_JDKLIB) $(LIBATTACH_CFLAGS), \
      CFLAGS_windows := /Gy, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(JDKLIB_LIBS), \
      LIBS_solaris := -ldoor, \