--- a/make/lib/PlatformLibraries.gmk	Wed Mar 14 21:35:41 2018 +0100
+++ b/make/lib/PlatformLibraries.gmk	Thu Mar 15 01:20:47 2018 +0100
@@ -29,9 +29,8 @@
 
   LIBOSXAPP_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxapp
 
-  $(eval $(call SetupNativeCompilation, BUILD_LIBOSXAPP, \
+  $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \
       NAME := osxapp, \
-      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       SRC := $(LIBOSXAPP_SRC), \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
@@ -53,7 +52,6 @@
           -framework OpenGL \
           -framework IOSurface \
           -framework QuartzCore, \
-      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxapp, \
   ))
 
   TARGETS += $(BUILD_LIBOSXAPP)