mirror of
https://github.com/cuberite/libevent.git
synced 2025-09-15 07:15:03 -04:00
Only specify -no-undefined on mingw
It turns out that commit 3cbca8661f broke building with shared libraries on OSX. Since -no-undefined is only necessary on platforms like win32, only use it there. There may be a better fix for this. Should fix bug 2997775.
This commit is contained in:
parent
a62c843340
commit
25433b96dc
14
Makefile.am
14
Makefile.am
@ -128,13 +128,19 @@ CORE_SRC = event.c evthread.c buffer.c \
|
||||
evmap.c log.c evutil.c evutil_rand.c strlcpy.c $(SYS_SRC)
|
||||
EXTRA_SRC = event_tagging.c http.c evdns.c evrpc.c
|
||||
|
||||
if BUILD_WIN32
|
||||
NO_UNDEFINED = -no-undefined
|
||||
else
|
||||
NO_UNDEFINED =
|
||||
endif
|
||||
|
||||
libevent_la_SOURCES = $(CORE_SRC) $(EXTRA_SRC)
|
||||
libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
|
||||
libevent_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
|
||||
libevent_la_LDFLAGS = -version-info $(VERSION_INFO) $(NO_UNDEFINED)
|
||||
|
||||
libevent_core_la_SOURCES = $(CORE_SRC)
|
||||
libevent_core_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
|
||||
libevent_core_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
|
||||
libevent_core_la_LDFLAGS = -version-info $(VERSION_INFO) $(NO_UNDEFINED)
|
||||
|
||||
if PTHREADS
|
||||
libevent_pthreads_la_SOURCES = evthread_pthread.c
|
||||
@ -142,12 +148,12 @@ endif
|
||||
|
||||
libevent_extra_la_SOURCES = $(EXTRA_SRC)
|
||||
libevent_extra_la_LIBADD = libevent_core.la $(SYS_LIBS)
|
||||
libevent_extra_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
|
||||
libevent_extra_la_LDFLAGS = -version-info $(VERSION_INFO) $(NO_UNDEFINED)
|
||||
|
||||
if OPENSSL
|
||||
libevent_openssl_la_SOURCES = bufferevent_openssl.c
|
||||
libevent_openssl_la_LIBADD = libevent_core.la -lcrypto -lssl
|
||||
libevent_openssl_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
|
||||
libevent_openssl_la_LDFLAGS = -version-info $(VERSION_INFO) $(NO_UNDEFINED)
|
||||
endif
|
||||
|
||||
noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
|
||||
|
Loading…
x
Reference in New Issue
Block a user