make/lib/CoreLibraries.gmk
branchihse-jdk-library-branch
changeset 56512 c030d6f39dfd
parent 56511 2b67c11c0db6
child 56519 1b154e6d8bb2
equal deleted inserted replaced
56511:2b67c11c0db6 56512:c030d6f39dfd
   130     OPTIMIZATION := HIGH, \
   130     OPTIMIZATION := HIGH, \
   131     CFLAGS := $(CFLAGS_JDKLIB) \
   131     CFLAGS := $(CFLAGS_JDKLIB) \
   132         $(LIBJAVA_CFLAGS), \
   132         $(LIBJAVA_CFLAGS), \
   133     System.c_CFLAGS := $(VERSION_CFLAGS), \
   133     System.c_CFLAGS := $(VERSION_CFLAGS), \
   134     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
   134     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
   135     EXTRA_HEADER_DIRS := $(call FindSrcDirsForLib, java.base, fdlibm), \
   135     EXTRA_HEADER_DIRS := $(call FindSrcDirsForComponent, java.base, libfdlibm), \
   136     WARNINGS_AS_ERRORS_xlc := false, \
   136     WARNINGS_AS_ERRORS_xlc := false, \
   137     DISABLED_WARNINGS_gcc := unused-result, \
   137     DISABLED_WARNINGS_gcc := unused-result, \
   138     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   138     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   139     LDFLAGS := $(LDFLAGS_JDKLIB) \
   139     LDFLAGS := $(LDFLAGS_JDKLIB) \
   140         $(call SET_SHARED_LIBRARY_ORIGIN), \
   140         $(call SET_SHARED_LIBRARY_ORIGIN), \
   288     LIBS_windows := advapi32.lib comctl32.lib user32.lib, \
   288     LIBS_windows := advapi32.lib comctl32.lib user32.lib, \
   289 ))
   289 ))
   290 
   290 
   291 TARGETS += $(BUILD_LIBJLI)
   291 TARGETS += $(BUILD_LIBJLI)
   292 
   292 
   293 LIBJLI_SRC_DIRS := $(call FindSrcDirsForLib, java.base, jli)
   293 LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli)
   294 
   294 
   295 # On windows, the static library has the same suffix as the import library created by
   295 # On windows, the static library has the same suffix as the import library created by
   296 # with the shared library, so the static library is given a different name. No harm
   296 # with the shared library, so the static library is given a different name. No harm
   297 # in doing it for all platform to reduce complexity.
   297 # in doing it for all platform to reduce complexity.
   298 ifeq ($(OPENJDK_TARGET_OS), windows)
   298 ifeq ($(OPENJDK_TARGET_OS), windows)