summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarc <marc@openbsd.org>2002-06-17 04:48:24 +0000
committermarc <marc@openbsd.org>2002-06-17 04:48:24 +0000
commit92e986cc593f61b5baa36e6179e2a87de50d201e (patch)
tree21c8937f97dc191701ef733e7f9564643fc2bd77
parentCompensate for dodgy Win98/WinME MSCHAPv2 responses later in the code (diff)
downloadwireguard-openbsd-92e986cc593f61b5baa36e6179e2a87de50d201e.tar.xz
wireguard-openbsd-92e986cc593f61b5baa36e6179e2a87de50d201e.zip
Remove bogus make expression that only confused readers of the file.
'make' will do the regression tests using libc_r 'make USELIBPTHREAD=yes' will do the regression tests using libpthread
-rw-r--r--regress/lib/libc_r/Makefile.inc9
-rw-r--r--regress/lib/libpthread/Makefile.inc9
2 files changed, 12 insertions, 6 deletions
diff --git a/regress/lib/libc_r/Makefile.inc b/regress/lib/libc_r/Makefile.inc
index 318c7040af9..c3c8a0887f3 100644
--- a/regress/lib/libc_r/Makefile.inc
+++ b/regress/lib/libc_r/Makefile.inc
@@ -1,19 +1,22 @@
-# $OpenBSD: Makefile.inc,v 1.4 2002/04/20 00:15:36 art Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2002/06/17 04:48:24 marc Exp $
# Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu
LIBC_R?= /usr/lib/libc_r.a
LIBPTHREAD?= /usr/lib/libpthread.a
+USELIBPTHREAD?= no
-.if 1 # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc"
+.if ${USELIBPTHREAD:L} == yes
+# this tests using libpthread/libc
LDADD+= -lpthread
DPADD+= ${LIBPTHREAD}
.else
+# This tests using libc_r
LDADD+= -pthread
DPADD+= ${LIBC_R}
.endif
CFLAGS+= -Wall # -Werror
-DEBUG= -ggdb
+#DEBUG= -ggdb
CFLAGS+= -DSRCDIR='"${.CURDIR}"'
CFLAGS+= -I${.CURDIR}/../include
diff --git a/regress/lib/libpthread/Makefile.inc b/regress/lib/libpthread/Makefile.inc
index 318c7040af9..c3c8a0887f3 100644
--- a/regress/lib/libpthread/Makefile.inc
+++ b/regress/lib/libpthread/Makefile.inc
@@ -1,19 +1,22 @@
-# $OpenBSD: Makefile.inc,v 1.4 2002/04/20 00:15:36 art Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2002/06/17 04:48:24 marc Exp $
# Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu
LIBC_R?= /usr/lib/libc_r.a
LIBPTHREAD?= /usr/lib/libpthread.a
+USELIBPTHREAD?= no
-.if 1 # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc"
+.if ${USELIBPTHREAD:L} == yes
+# this tests using libpthread/libc
LDADD+= -lpthread
DPADD+= ${LIBPTHREAD}
.else
+# This tests using libc_r
LDADD+= -pthread
DPADD+= ${LIBC_R}
.endif
CFLAGS+= -Wall # -Werror
-DEBUG= -ggdb
+#DEBUG= -ggdb
CFLAGS+= -DSRCDIR='"${.CURDIR}"'
CFLAGS+= -I${.CURDIR}/../include