Skip to content

Commit 5d3e6de

Browse files
committed
autotools fixes for build/test outside src dir
Two small fixes needed to enable build/test to happen in an external directory (for example when building libdispatch under the control of swift/utils/build-script).
1 parent 3ce4e3d commit 5d3e6de

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,6 @@ AC_CONFIG_FILES([Makefile dispatch/Makefile man/Makefile os/Makefile private/Mak
339339
#
340340
# Generate testsuite links
341341
#
342-
AC_CONFIG_LINKS([tests/dispatch:${x:+}private tests/leaks-wrapper:tests/leaks-wrapper.sh])
342+
AC_CONFIG_LINKS([tests/dispatch:$top_srcdir/private tests/leaks-wrapper:tests/leaks-wrapper.sh])
343343

344344
AC_OUTPUT

tests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if HAVE_PTHREAD_WORKQUEUES
118118
PTHREAD_WORKQUEUE_LIBS=-lpthread_workqueue
119119
endif
120120

121-
LDADD=libbsdtests.la ../src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
121+
LDADD=libbsdtests.la $(top_builddir)/src/libdispatch.la $(KQUEUE_LIBS) $(PTHREAD_WORKQUEUE_LIBS) $(BSD_OVERLAY_LIBS)
122122
libbsdtests_la_LDFLAGS=-avoid-version
123123

124124
bsdtestsummarize_LDADD=-lm $(BSD_OVERLAY_LIBS)

0 commit comments

Comments
 (0)