svn commit: trunk/uClibc
psm at uclibc.org
psm at uclibc.org
Tue Sep 27 09:53:05 UTC 2005
Author: psm
Date: 2005-09-27 02:53:03 -0700 (Tue, 27 Sep 2005)
New Revision: 11666
Log:
Do not create libc.so linker script if only development headers are installed
Modified:
trunk/uClibc/Makefile
Changeset:
Modified: trunk/uClibc/Makefile
===================================================================
--- trunk/uClibc/Makefile 2005-09-27 08:43:33 UTC (rev 11665)
+++ trunk/uClibc/Makefile 2005-09-27 09:53:03 UTC (rev 11666)
@@ -240,15 +240,21 @@
sed -e 's/lib\///'` ; do \
$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
$(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
- done;
- $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so
- sed -e '/^GROUP/d' $(TOPDIR)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so
+ done
ifeq ($(strip $(COMPAT_ATEXIT)),y)
- echo "GROUP ( $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) )" >> \
- $(PREFIX)$(DEVEL_PREFIX)lib/libc.so
+ if [ -f $(PREFIX)$(DEVEL_PREFIX)lib/libc.so ] ; then \
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+ sed -e '/^GROUP/d' $(TOPDIR)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+ echo "GROUP ( $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) )" \
+ >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+ fi
else
- echo "GROUP ( $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) )" >> \
- $(PREFIX)$(DEVEL_PREFIX)lib/libc.so
+ if [ -f $(PREFIX)$(DEVEL_PREFIX)lib/libc.so ] ; then \
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+ sed -e '/^GROUP/d' $(TOPDIR)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+ echo "GROUP ( $(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) $(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME) )" \
+ >> $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+ fi
endif
ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
@@ -257,12 +263,11 @@
# # If we build shared libraries then the static libs are PIC...
# # Make _pic.a symlinks to make mklibs.py and similar tools happy.
if [ -d lib ] ; then \
- for i in `find lib/ -type f -name '*.a' | sed -e 's/lib\///'` ; do \
+ for i in `find lib/ -type f -name 'lib*.a' | sed -e 's/lib\///'` ; do \
$(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \
| sed -e 's/\.a$$/_pic.a/'`; \
done ; \
fi
- $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/uclibc_nonshared_pic.a
# Ugh!!! Remember that libdl.a and libdl_pic.a are different. Since
# libdl is pretty small, and not likely to benefit from mklibs.py and
# similar, lets just remove libdl_pic.a and avoid the issue
More information about the uClibc-cvs
mailing list