make/lib/CoreLibraries.gmk

Print this page

        

@@ -156,11 +156,12 @@
     LDFLAGS_SUFFIX_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\
     LDFLAGS_SUFFIX_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/ -lfdlibm \
         -framework CoreFoundation \
         -framework Foundation \
         -framework Security -framework SystemConfiguration, \
-    LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
+    LDFLAGS_SUFFIX_windows := -export:jdk_strerror \
+        -export:winFileHandleOpen -export:handleLseek \
         -export:getLastErrorString \
         jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
         shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
         advapi32.lib version.lib, \
     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \

@@ -345,10 +346,16 @@
           zcrc32.c \
           zutil.c \
       )
 endif
 
+LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libjava
+LIBJLI_EXTRA_FILES += \
+    $(addprefix $(JDK_TOPDIR)/src/java.base/share/native/libjava/, \
+        jdk_strerror.c \
+    )
+
 $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
     LIBRARY := jli, \
     OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
     SRC := $(LIBJLI_SRC_DIRS), \
     EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \