make/lib/Lib-jdk.packager.gmk
branchJDK-8200758-branch
changeset 56885 4c56efca06ca
parent 56821 565d54ca1f41
child 56957 2f01969ed7cb
equal deleted inserted replaced
56884:0b2da0fd5363 56885:4c56efca06ca
    49     OPTIMIZATION := LOW, \
    49     OPTIMIZATION := LOW, \
    50     CFLAGS := $(CXXFLAGS_JDKLIB) -I$(LIBPACKAGER_SHARED_SRC), \
    50     CFLAGS := $(CXXFLAGS_JDKLIB) -I$(LIBPACKAGER_SHARED_SRC), \
    51     CFLAGS_windows :=  -nologo -EHsc -D_WINDOWS -DUNICODE -D_UNICODE -DWIN32 -D_LITTLE_ENDIAN -DWIN32_LEAN_AND_MEAN, \
    51     CFLAGS_windows :=  -nologo -EHsc -D_WINDOWS -DUNICODE -D_UNICODE -DWIN32 -D_LITTLE_ENDIAN -DWIN32_LEAN_AND_MEAN, \
    52     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
    52     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
    53         $(call SET_SHARED_LIBRARY_ORIGIN), \
    53         $(call SET_SHARED_LIBRARY_ORIGIN), \
       
    54     LIBS := $(LIBCXX), \
    54     LIBS_windows := user32.lib shell32.lib advapi32.lib ole32.lib, \
    55     LIBS_windows := user32.lib shell32.lib advapi32.lib ole32.lib, \
       
    56     LIBS_linux := -ldl -lpthread, \
    55     CFLAGS_linux :=  -Wextra -Wformat -Wformat-security -c -fPIC, \
    57     CFLAGS_linux :=  -Wextra -Wformat -Wformat-security -c -fPIC, \
    56     LDFLAGS_macosx := -ldl -dynamiclib -framework Cocoa -stdlib=libc++, \
    58     LDFLAGS_macosx := -dynamiclib -stdlib=libc++, \
    57     LDFLAGS_linux :=  -ldl -shared -lpthread -static-libstdc++, \
    59     LIBS_macosx := -ldl -framework Cocoa, \
    58     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
    60     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
    59 ))
    61 ))
    60 
    62 
    61 $(BUILD_LIBPACKAGER): $(call FindLib, java.base, java)
    63 $(BUILD_LIBPACKAGER): $(call FindLib, java.base, java)
    62 
    64 
    81     CFLAGS_macosx := -fPIC, \
    83     CFLAGS_macosx := -fPIC, \
    82     CFLAGS_windows :=  -nologo -EHsc -D_WINDOWS -DUNICODE -D_UNICODE -DWIN32 -D_LITTLE_ENDIAN -DWIN32_LEAN_AND_MEAN, \
    84     CFLAGS_windows :=  -nologo -EHsc -D_WINDOWS -DUNICODE -D_UNICODE -DWIN32 -D_LITTLE_ENDIAN -DWIN32_LEAN_AND_MEAN, \
    83     DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
    85     DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
    84     LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
    86     LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
    85         $(call SET_SHARED_LIBRARY_ORIGIN), \
    87         $(call SET_SHARED_LIBRARY_ORIGIN), \
    86     LDFLAGS_macosx := -framework Cocoa -stdlib=libstdc++, \
    88     LDFLAGS_macosx := -stdlib=libstdc++, \
       
    89     LIBS_macosx := -framework Cocoa, \
    87     LIBS := $(LIBCXX), \
    90     LIBS := $(LIBCXX), \
    88     LIBS_solaris :=  -lc, \
    91     LIBS_solaris :=  -lc, \
    89     LDFLAGS_linux :=  -ldl -static-libstdc++, \
    92     LIBS_linux := -ldl, \
    90     LIBS_windows :=  user32.lib shell32.lib advapi32.lib, \
    93     LIBS_windows :=  user32.lib shell32.lib advapi32.lib, \
    91     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
    94     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
    92 ))
    95 ))
    93 
    96 
    94 TARGETS += $(BUILD_PACKAGERAPPLAUNCHEREXE)
    97 TARGETS += $(BUILD_PACKAGERAPPLAUNCHEREXE)