--- a/make/lib/Lib-jdk.internal.le.gmk	Tue Mar 13 11:32:32 2018 +0100
+++ b/make/lib/Lib-jdk.internal.le.gmk	Tue Mar 13 14:33:34 2018 +0100
@@ -36,21 +36,14 @@
       -I$(SUPPORT_OUTPUTDIR)/headers/jdk.internal.le \
       #
 
-  $(eval $(call SetupNativeCompilation, BUILD_LIBLE, \
+  $(eval $(call SetupJdkLibrary, BUILD_LIBLE, \
       NAME := le, \
-      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       SRC := $(LIBLE_SRC), \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) $(LIBJAVA_HEADER_FLAGS)\
           $(LIBLE_CPPFLAGS), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(JDKLIB_LIBS) user32.lib, \
-      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
-      RC_FLAGS := $(RC_FLAGS) \
-          -D "JDK_FNAME=le.dll" \
-          -D "JDK_INTERNAL_NAME=le" \
-          -D "JDK_FTYPE=0x2L", \
-      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/lible, \
   ))
 
   TARGETS += $(BUILD_LIBLE)