diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 2003-01-14 20:04:45 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 2003-01-14 20:04:45 +0000 |
| commit | a3c0a4d8aca4510d261be169ad80ffc9f559f6cf (patch) | |
| tree | 190de08d6123125d403cc2dd22b0e3ea29485142 /regress | |
| parent | 69410924d125248c17d6e29068b99d049eb1a69a (diff) | |
Bye-bye libc_r. libc_r and libnpthread go away. libpthread
takes their place. The -pthread option to gcc uses libpthread.
ppc portion of patch from drahn@ (thanks). gcc portions of patch
OK espie@. Ports testing (no bad effects!) by naddy@
best build sequence is: build gcc, build system, build ports
remove /usr/lib/lib{c_r,npthread}.*. Note, once libc_r and
libnpthread is removed threaded ports will stop working until
they have been re-built using the libpthread and the updated gcc.
That's why the above build sequence is recommended.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/lib/libc_r/Makefile.inc | 15 | ||||
| -rw-r--r-- | regress/lib/libpthread/Makefile.inc | 15 |
2 files changed, 6 insertions, 24 deletions
diff --git a/regress/lib/libc_r/Makefile.inc b/regress/lib/libc_r/Makefile.inc index d5cb0b8f4a0..306a37d132c 100644 --- a/regress/lib/libc_r/Makefile.inc +++ b/regress/lib/libc_r/Makefile.inc @@ -1,19 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.7 2002/11/16 05:02:48 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2003/01/14 20:04:44 marc Exp $ # Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu -LIBC_R?= /usr/lib/libc_r.a -LIBPTHREAD?= /usr/lib/libnpthread.a -USELIBPTHREAD?= no +LIBPTHREAD= /usr/lib/libpthread.a -.if ${USELIBPTHREAD:L} == yes -# this tests using libnpthread/libc -LDADD+= -lnpthread -DPADD+= ${LIBPTHREAD} -.else -# This tests using libc_r LDADD+= -pthread -DPADD+= ${LIBC_R} -.endif +DPADD+= ${LIBPTHREAD} CFLAGS+= -Wall # -Werror #DEBUG= -ggdb diff --git a/regress/lib/libpthread/Makefile.inc b/regress/lib/libpthread/Makefile.inc index d5cb0b8f4a0..306a37d132c 100644 --- a/regress/lib/libpthread/Makefile.inc +++ b/regress/lib/libpthread/Makefile.inc @@ -1,19 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.7 2002/11/16 05:02:48 marc Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2003/01/14 20:04:44 marc Exp $ # Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu -LIBC_R?= /usr/lib/libc_r.a -LIBPTHREAD?= /usr/lib/libnpthread.a -USELIBPTHREAD?= no +LIBPTHREAD= /usr/lib/libpthread.a -.if ${USELIBPTHREAD:L} == yes -# this tests using libnpthread/libc -LDADD+= -lnpthread -DPADD+= ${LIBPTHREAD} -.else -# This tests using libc_r LDADD+= -pthread -DPADD+= ${LIBC_R} -.endif +DPADD+= ${LIBPTHREAD} CFLAGS+= -Wall # -Werror #DEBUG= -ggdb |