--- a/make/lib/Lib-jdk.attach.gmk	Thu Apr 12 14:11:59 2018 +0200
+++ b/make/lib/Lib-jdk.attach.gmk	Mon Apr 16 11:48:41 2018 +0200
@@ -36,12 +36,12 @@
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBATTACH, \
     NAME := attach, \
-    SRC := $(call FindSrcDirsForLib, jdk.attach, attach), \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) \
+    CFLAGS := $(CFLAGS_JDKLIB) $(LIBATTACH_CFLAGS), \
+    CFLAGS_windows := /Gy, \
+    HEADER_FLAGS := \
         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.attach \
-        $(LIBJAVA_HEADER_FLAGS) $(LIBATTACH_CFLAGS), \
-    CFLAGS_windows := /Gy, \
+        $(LIBJAVA_HEADER_FLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \