aboutsummaryrefslogtreecommitdiff
path: root/elf/rtld-Rules
diff options
context:
space:
mode:
Diffstat (limited to 'elf/rtld-Rules')
-rw-r--r--elf/rtld-Rules19
1 files changed, 3 insertions, 16 deletions
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index 01fbbdf..ac96f72 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, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003 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,14 +28,7 @@
rtld-all:
# When run from the elf/Makefile to build rtld-libc.a, $(subdir) is 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.
+ifeq ($(subdir),elf)
ifndef rtld-subdirs
error This makefile is a subroutine of elf/Makefile not to be used directly
@@ -72,16 +65,10 @@ include $(patsubst %,../o-iterator.mk,$(object-suffixes-left))
# This is how we descend into each subdirectory. See below.
define rtld-subdir-make
-$(MAKE) $(subdir-args) objdir=$(objdir) \
- -f Makefile -f ../elf/rtld-Rules rtld-all \
+$(MAKE) -C ../$* objdir=$(objdir) -f Makefile -f ../elf/rtld-Rules rtld-all \
rtld-modules='$(addprefix rtld-,$(rtld-$*))'
endef
-# See subdir-target-args in ../Makefile for the model.
-subdir-args = subdir=$*$(if $($*-srcdir),\
- -C $($*-srcdir) ..=`pwd`/,\
- -C $(..)$* ..=../)
-
FORCE:
else