diff mbox

[roland/nptl] Link tst-timer against librt only when subdir is rt

Message ID 20140703171541.GY20796@spoyarek.pnq.redhat.com
State Committed
Headers show

Commit Message

Siddhesh Poyarekar July 3, 2014, 5:15 p.m. UTC
Hi Roland,

I've started the build for roland/nptl in rawhide.  Among the changes
I had to make for rtkaio, there's a change that is probably relevant
upstream, which is to link tst-timer against librt only when the
subdir is rt.  This check was in place earlier, but was removed during
the move.  OK to put it back?

Siddhesh

	* sysdeps/pthread/Makefile: Link tst-timer against librt only
	when the subdir is rt.

Comments

Roland McGrath July 4, 2014, 1:53 a.m. UTC | #1
That's certainly right, it was an unintentional change, and I've put it in
now.  But I'm confused as to how that dependency hurt anything in other
subdirs where nothing wants to build tst-timer.


Thanks,
Roland
Siddhesh Poyarekar July 4, 2014, 2:01 a.m. UTC | #2
On Thu, Jul 03, 2014 at 06:53:39PM -0700, Roland McGrath wrote:
> That's certainly right, it was an unintentional change, and I've put it in
> now.  But I'm confused as to how that dependency hurt anything in other
> subdirs where nothing wants to build tst-timer.

The rtkaio patch in Fedora as the tst-timer test and it doesn't want
to be linked to librt.so.

Siddhesh
diff mbox

Patch

diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 1080dc9..af1a44d 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -16,8 +16,10 @@ 
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
 
+ifeq ($(subdir),rt)
 ifeq (yes,$(build-shared))
 $(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
 else
 $(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
 endif
+endif