summary refs log tree commit diff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-12 01:34:32 +0000
committerRoland McGrath <roland@gnu.org>1996-06-12 01:34:32 +0000
commit6e86a7c21b25f271304238a0cff0dd638343a5c2 (patch)
treec16d93ff60aa8304dac31faee111abaed3109e74 /Makerules
parenta89d30d44492de151143ba26ae9c62ea2b79efb8 (diff)
downloadglibc-6e86a7c21b25f271304238a0cff0dd638343a5c2.tar.gz
glibc-6e86a7c21b25f271304238a0cff0dd638343a5c2.tar.xz
glibc-6e86a7c21b25f271304238a0cff0dd638343a5c2.zip
* Makerules (elfobjdir): Use $(objdir) if set, even in elf subdir.
	* elf/Makefile (routines): Remove init-first.
	* csu/Makefile (routines): New variable; put it here instead.

	* config.make.in (CFLAGS): New variable.

	* io/sys/stat.h (S_ISLNK, S_ISSOCK): Make conditional on __USE_BSD,
	not __USE_GNU.
	* string/string.h (strncasecmp): Likewise.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules6
1 files changed, 1 insertions, 5 deletions
diff --git a/Makerules b/Makerules
index ff6adcf9d2..5320ff4a9b 100644
--- a/Makerules
+++ b/Makerules
@@ -493,11 +493,7 @@ LDFLAGS-c.so = -nostdlib -nostartfiles
 # Give libc.so an entry point and make it directly runnable itself.
 LDFLAGS-c.so += -e __libc_print_version
 # Use our own special initializer and finalizer files for libc.so.
-ifeq (elf, $(subdir))
-elfobjdir := .
-else
-elfobjdir := $(firstword $(objdir) $(..)elf)
-endif
+elfobjdir := $(firstword $(objdir) $(patsubst ../$(subdir),.,$(..)elf))
 $(common-objpfx)libc.so: $(elfobjdir)/soinit.so \
 			 $(common-objpfx)libc_pic.a \
 			 $(elfobjdir)/sofini.so $(elfobjdir)/ld.so