summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-04-26 16:03:17 +0000
committerEric Andersen <andersen@codepoet.org>2001-04-26 16:03:17 +0000
commitea633bb9d23060c16cca658313f32e9fee70ea40 (patch)
tree52cd952cf37717c0ac87ce444da17e87dfed8155
parent01f93e1725c06494467d25c9dfb8157263bf58b2 (diff)
Oops. I forgot to check this in last night, so if anybody built
uClibc during the last 18 hours it would have failed. Sorry about that... -Erik
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c80c9e8e1..5a926f366 100644
--- a/Makefile
+++ b/Makefile
@@ -40,22 +40,23 @@ $(LIBNAME): halfclean headers uClibc_config.h subdirs
$(CROSS)ranlib $(LIBNAME)
shared: $(LIBNAME)
- @make -C ld.so-1
@rm -rf tmp
@mkdir tmp
@(cd tmp; CC=$(CC) /bin/sh ../extra/scripts/get-needed-libgcc-objects.sh)
if [ -s ./tmp/libgcc-need.a ] ; then \
$(CC) -g $(LDFLAGS) -shared -o $(SHARED_FULLNAME) \
-Wl,-soname,$(SHARED_MAJORNAME) -Wl,--whole-archive \
- ./$(LIBNAME) ./tmp/libgcc-need.a ; \
+ ./$(LIBNAME) ./tmp/libgcc-need.a \
+ ld.so-1/d-link/ld-linux-uclibc.so.0; \
else \
$(CC) -g $(LDFLAGS) -shared -o $(SHARED_FULLNAME) \
-Wl,-soname,$(SHARED_MAJORNAME) -Wl,--whole-archive \
- ./$(LIBNAME) ; \
+ ./$(LIBNAME) ld.so-1/d-link/ld-linux-uclibc.so.0; \
fi
@rm -rf tmp
ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME)
ln -sf $(SHARED_MAJORNAME) libc.so
+ @make -C ld.so-1
done: $(LIBNAME) $(DO_SHARED)
@echo
@@ -94,6 +95,7 @@ tags:
clean: subdirs_clean halfclean
@rm -rf tmp
rm -f include/asm include/linux include/bits
+ @make -C ld.so-1 clean
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS) test)