r702 - in x86/trunk/packages: binutils gcc

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Sep 19 04:51:03 PDT 2005


Author: jhuntwork
Date: 2005-09-19 05:51:02 -0600 (Mon, 19 Sep 2005)
New Revision: 702

Modified:
   x86/trunk/packages/binutils/Makefile
   x86/trunk/packages/gcc/Makefile
Log:
Minor adjustment to gcc, fixed adjusting toolchain sed

Modified: x86/trunk/packages/binutils/Makefile
===================================================================
--- x86/trunk/packages/binutils/Makefile	2005-09-19 04:51:05 UTC (rev 701)
+++ x86/trunk/packages/binutils/Makefile	2005-09-19 11:51:02 UTC (rev 702)
@@ -59,9 +59,10 @@
 	@echo 'main(){}' > dummy.c && cc dummy.c && \
 	 readelf -l a.out > .specstest
 	@if ! cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \
-	 make -C ld install && SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \
+	 make -C ld install && \
+	 SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \
 	 gcc -dumpspecs > $$SPECFILE && \
-         sed 's@ /lib/$(LINKER)@ $(WD)/lib/$(LINKER)@g' $$SPECFILE > tempspecfile && \
+         sed 's@^/lib/$(LINKER)@$(WD)&@g' $$SPECFILE > tempspecfile && \
          mv -f tempspecfile $$SPECFILE && unset SPECFILE && \
          GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \
 	 find $${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rf '{}' \; && \

Modified: x86/trunk/packages/gcc/Makefile
===================================================================
--- x86/trunk/packages/gcc/Makefile	2005-09-19 04:51:05 UTC (rev 701)
+++ x86/trunk/packages/gcc/Makefile	2005-09-19 11:51:02 UTC (rev 702)
@@ -67,7 +67,7 @@
 # Configure commands below \/
 #==============================================================================
 	@cd ../$(DIR) ; cp gcc/Makefile.in{,.orig} && \
-	 sed 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g' \
+	 sed 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 $(WD)/include at g' \
 	 gcc/Makefile.in.orig > gcc/Makefile.in
 	@cd ../$(DIR) ; cp gcc/Makefile.in{,.tmp} && \
 	 sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \




More information about the livecd mailing list