X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcleanup-toolchain;h=cc66a2d2fc3bb4fab9215c75a743a80577335304;hp=bc6930c9e32aefa3bf29f9adaa4d63d5e9652735;hb=3529923589dbf8824543920f27fc901fcbab67c4;hpb=7c0fce586f18ab3df70de1138f85b5bfc72e1a6e

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index bc6930c9e3..cc66a2d2fc 100644
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -51,14 +51,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 ifeq "$(PASS)" "1"
 	mv -v /tools/bin/{ld,ld-old}
-	mv -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old}
+	mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
 	cp -v /tools/bin/{ld-new,ld}
-	ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld
-	gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs
-	sed 's@^/lib/ld-linux.so.2@/tools&@g' /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs > tempspecfile
-	mv -vf tempspecfile /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs
-	find /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
-	rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/include/*`
+	ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld
+	gcc -dumpspecs > /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs
+	sed 's@^/lib/ld-linux.so@/tools&@g' /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs > tempspecfile
+	mv -vf tempspecfile /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs
+	find /tools/lib/gcc/$(BUILDTARGET)/4.1.2/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
+	rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/$(BUILDTARGET)/4.1.2/include/*`
 endif
 ifeq "$(PASS)" "2"
 	-strip --strip-debug /tools/lib/*
@@ -68,12 +68,12 @@ ifeq "$(PASS)" "2"
 endif
 ifeq "$(PASS)" "3"
 	mv -v /tools/bin/{ld,ld-old}
-	mv -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old}
+	mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
 	mv -v /tools/bin/{ld-new,ld}
-	ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld
+	ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld
 	gcc -dumpspecs | \
-	perl -p -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g;' \
+	perl -p -e 's@/tools/lib/ld-linux.so@/lib/ld-linux.so@g;' \
 	    -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \
-	    /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs
+	    /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs
 endif
 	@$(POSTBUILD)