r617 - x86/trunk/packages/binutils

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Sep 5 17:16:40 PDT 2005


Author: jhuntwork
Date: 2005-09-05 18:16:40 -0600 (Mon, 05 Sep 2005)
New Revision: 617

Modified:
   x86/trunk/packages/binutils/Makefile
Log:
Fixed linker issues for ppc arch

Modified: x86/trunk/packages/binutils/Makefile
===================================================================
--- x86/trunk/packages/binutils/Makefile	2005-09-06 00:09:55 UTC (rev 616)
+++ x86/trunk/packages/binutils/Makefile	2005-09-06 00:16:40 UTC (rev 617)
@@ -13,6 +13,12 @@
 
 include $(ROOT)/scripts/functions
 
+ifeq ($(ARCH),ppc)
+	LINKER=ld.so.1
+else
+	LINKER=ld-linux.so.2
+endif
+
 pass1: $(FILE)
 	@$(sep_dir_build)
 	@cp $(SRC)/$(FILE) $(LFSSRC)
@@ -54,7 +60,7 @@
 	 readelf -l a.out > .specstest
 	@if ! cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
 	 make -C ld install && SPECFILE=`gcc --print-file specs` && \
-         sed 's@ /lib/ld-linux.so.2@ $(WD)/lib/ld-linux.so.2 at g' \
+         sed 's@ /lib/$(LINKER)@ $(WD)/lib/$(LINKER)@g' \
 	 $$SPECFILE > tempspecfile && \
          mv -f tempspecfile $$SPECFILE && unset SPECFILE && \
          rm -f $(WD)/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h} && \
@@ -107,7 +113,7 @@
 	 readelf -l a.out > .specstest
 	@if cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
 	 make -C ld INSTALL=$(WD)/bin/install install && \
-         perl -pi -e 's@ $(WD)/lib/ld-linux.so.2@ /lib/ld-linux.so.2 at g;' \
+         perl -pi -e 's@ $(WD)/lib/$(LINKER)@ /lib/$(LINKER)@g;' \
 	 -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/@g;' \
 	 `gcc --print-file specs` ; fi
 	@make clean




More information about the livecd mailing list