equal
deleted
inserted
replaced
40 NAME := dt_socket, \ |
40 NAME := dt_socket, \ |
41 SRC := $(LIBDT_SOCKET_SRC), \ |
41 SRC := $(LIBDT_SOCKET_SRC), \ |
42 OPTIMIZATION := LOW, \ |
42 OPTIMIZATION := LOW, \ |
43 CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \ |
43 CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \ |
44 $(LIBDT_SOCKET_CPPFLAGS), \ |
44 $(LIBDT_SOCKET_CPPFLAGS), \ |
45 MAPFILE := $(TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \ |
|
46 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
45 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
47 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
46 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
48 LDFLAGS_windows := -export:jdwpTransport_OnLoad, \ |
|
49 LIBS_linux := -lpthread, \ |
47 LIBS_linux := -lpthread, \ |
50 LIBS_solaris := -lnsl -lsocket, \ |
48 LIBS_solaris := -lnsl -lsocket, \ |
51 LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \ |
49 LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \ |
52 )) |
50 )) |
53 |
51 |
71 SRC := $(LIBJDWP_SRC), \ |
69 SRC := $(LIBJDWP_SRC), \ |
72 OPTIMIZATION := LOW, \ |
70 OPTIMIZATION := LOW, \ |
73 CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \ |
71 CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \ |
74 $(LIBJDWP_CPPFLAGS) \ |
72 $(LIBJDWP_CPPFLAGS) \ |
75 -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \ |
73 -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \ |
76 MAPFILE := $(TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \ |
|
77 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
74 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
78 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
75 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
79 LIBS := $(JDKLIB_LIBS), \ |
76 LIBS := $(JDKLIB_LIBS), \ |
80 LIBS_linux := $(LIBDL), \ |
77 LIBS_linux := $(LIBDL), \ |
81 LIBS_solaris := $(LIBDL), \ |
78 LIBS_solaris := $(LIBDL), \ |