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
This commit is contained in:
parent
3d03791bb4
commit
539e7a7770
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=169669
@ -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
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${DEFAULT_THREAD_LIB} == "libpthread"
|
||||
.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib"
|
||||
SHLIBDIR= /lib
|
||||
.endif
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${DEFAULT_THREAD_LIB} == "libpthread"
|
||||
.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib"
|
||||
SHLIBDIR= /lib
|
||||
.endif
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${DEFAULT_THREAD_LIB} == "libthr"
|
||||
.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib"
|
||||
SHLIBDIR= /lib
|
||||
.endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user