--- a/make/lib/Lib-java.prefs.gmk Fri Jun 08 11:30:10 2018 +0200
+++ b/make/lib/Lib-java.prefs.gmk Fri Jun 08 18:11:32 2018 +0200
@@ -27,18 +27,16 @@
################################################################################
+# libprefs on macosx do not use the unix code
ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBPREF_SRC_DIRS := $(TOPDIR)/src/java.prefs/macosx/native/libprefs
-else
- LIBPREF_SRC_DIRS := $(TOPDIR)/src/java.prefs/$(OPENJDK_TARGET_OS_TYPE)/native/libprefs
+ LIBPREFS_EXCLUDE_SRC_PATTERNS := unix
endif
$(eval $(call SetupJdkLibrary, BUILD_LIBPREFS, \
NAME := prefs, \
- SRC := $(LIBPREF_SRC_DIRS), \
+ EXCLUDE_SRC_PATTERNS := $(LIBPREFS_EXCLUDE_SRC_PATTERNS), \
OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBPREF_SRC_DIRS)) \
- $(LIBJAVA_HEADER_FLAGS), \
+ CFLAGS := $(CFLAGS_JDKLIB), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_unix := -ljvm, \