diff options
| author | ru <ru@FreeBSD.org> | 2007-05-18 12:25:48 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2007-05-18 12:25:48 +0000 |
| commit | 3be5d73f3d1c92dd592d30ddfcf7d342c48cb971 (patch) | |
| tree | ff6895b7410ca44884a83668b3875f0764a9a0f6 /lib | |
| parent | 6d5baaa0915889111c959912b06a8315052876c5 (diff) | |
| download | FreeBSD-src-3be5d73f3d1c92dd592d30ddfcf7d342c48cb971.zip FreeBSD-src-3be5d73f3d1c92dd592d30ddfcf7d342c48cb971.tar.gz | |
Fix a logic bug I re-introduced in my patch I sent to Daniel
that would cause the selected shared threading library to be
overwritten with its 32-bit version on amd64.
PR: amd64/112509
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc_r/Makefile | 2 | ||||
| -rw-r--r-- | lib/libkse/Makefile | 2 | ||||
| -rw-r--r-- | lib/libpthread/Makefile | 2 | ||||
| -rw-r--r-- | lib/libthr/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile index 1a5eb3b..f8ea3b1 100644 --- a/lib/libc_r/Makefile +++ b/lib/libc_r/Makefile @@ -10,7 +10,7 @@ .include <bsd.own.mk> -.if ${DEFAULT_THREAD_LIB} == "libc_r" +.if ${DEFAULT_THREAD_LIB} == "libc_r" && ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index a698115..323a8ec48 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -10,7 +10,7 @@ .include <bsd.own.mk> -.if ${DEFAULT_THREAD_LIB} == "libpthread" +.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index a698115..323a8ec48 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -10,7 +10,7 @@ .include <bsd.own.mk> -.if ${DEFAULT_THREAD_LIB} == "libpthread" +.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index ca77af9..a6b54d4 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -10,7 +10,7 @@ .include <bsd.own.mk> -.if ${DEFAULT_THREAD_LIB} == "libthr" +.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif |
