aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-04-26 20:05:30 +0000
committerRoland McGrath <roland@gnu.org>2005-04-26 20:05:30 +0000
commit0980fc872498445033119b2bffe058a1a1350185 (patch)
treee93a973ba601a476312335ccb1f4a11a1a002867
parent8cf3e47119ae1d40592a3b15aecc50d9a0ec0179 (diff)
downloadglibc-0980fc872498445033119b2bffe058a1a1350185.tar
glibc-0980fc872498445033119b2bffe058a1a1350185.tar.gz
glibc-0980fc872498445033119b2bffe058a1a1350185.tar.bz2
glibc-0980fc872498445033119b2bffe058a1a1350185.zip
2005-04-26 Roland McGrath <roland@redhat.com>
* elf/rtld-Rules (rtld-all): Test ifndef rtld-modules instead of ifeq ($(subdir),elf) to distinguish main driver from subdir runs.
-rw-r--r--elf/rtld-Rules11
1 files changed, 9 insertions, 2 deletions
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index ac96f728d9..61143b180c 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -1,6 +1,6 @@
# Subroutine makefile for compiling libc modules linked into dynamic linker.
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -28,7 +28,14 @@
rtld-all:
# When run from the elf/Makefile to build rtld-libc.a, $(subdir) is elf.
-ifeq ($(subdir),elf)
+ifneq ($(subdir),elf)
+ifndef rtld-modules
+error rtld-modules not set
+endif
+endif
+
+ifndef rtld-modules
+# Running to build rtld-libc.a, driving runs of $(rtld-subdir-make), below.
ifndef rtld-subdirs
error This makefile is a subroutine of elf/Makefile not to be used directly