Skip to content

Commit 870b346

Browse files
KatashiMonosatodas
authored andcommitted
Merge remote-tracking branch 'apple/master' into port-transform-and-use-libbsd
Fix src/Makefile.am Signed-off-by: Daniel A. Steffen <[email protected]>
1 parent 7750dc2 commit 870b346

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/Makefile.am

+3-4
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ AM_OBJCFLAGS=$(DISPATCH_CFLAGS) $(CBLOCKS_FLAGS)
5656
AM_CXXFLAGS=$(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
5757
AM_OBJCXXFLAGS=$(DISPATCH_CFLAGS) $(CXXBLOCKS_FLAGS)
5858

59-
libdispatch_la_LIBADD = $(BSD_OVERLAY_LIBS)
60-
libdispatch_la_LDFLAGS=-avoid-version
61-
libdispatch_la_LIBADD=$(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS)
62-
6359
if HAVE_PTHREAD_WORKQUEUES
6460
PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
6561
endif
6662

63+
libdispatch_la_LDFLAGS=-avoid-version
64+
libdispatch_la_LIBADD=$(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
65+
6766
if HAVE_DARWIN_LD
6867
libdispatch_la_LDFLAGS+=-Wl,-compatibility_version,1 \
6968
-Wl,-current_version,$(VERSION) -Wl,-dead_strip \

0 commit comments

Comments
 (0)