From 3be5d73f3d1c92dd592d30ddfcf7d342c48cb971 Mon Sep 17 00:00:00 2001 From: ru Date: Fri, 18 May 2007 12:25:48 +0000 Subject: 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 --- lib/libc_r/Makefile | 2 +- lib/libkse/Makefile | 2 +- lib/libpthread/Makefile | 2 +- lib/libthr/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') 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 -.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 -.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 -.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 -.if ${DEFAULT_THREAD_LIB} == "libthr" +.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif -- cgit v1.1