--- a/make/lib/Lib-jdk.pack.gmk Mon Apr 16 14:51:31 2018 +0200
+++ b/make/lib/Lib-jdk.pack.gmk Wed Apr 18 14:22:53 2018 +0200
@@ -39,10 +39,9 @@
OPTIMIZATION := LOW, \
CXXFLAGS := $(CXXFLAGS_JDKLIB) \
-DNO_ZLIB -DUNPACK_JNI -DFULL, \
+ CFLAGS_release := -DPRODUCT, \
HEADER_FLAGS := \
- -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
- $(LIBJAVA_HEADER_FLAGS), \
- CFLAGS_release := -DPRODUCT, \
+ -I$(call FindHeaderDirForModule, java.base), \
DISABLED_WARNINGS_gcc := implicit-fallthrough, \
DISABLED_WARNINGS_microsoft := 4005, \
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \