X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcleanup-toolchain;fp=lfs%2Fcleanup-toolchain;h=1c1fa8a50eda33426d99e0d3e8fe4aa142aa00e2;hp=91e056ed8348aafac07054824d988913204c47f5;hb=6c4cc7ea1bcb58c586ae64ae6f76720b6b89bda4;hpb=f1effdf75849c86828765adce612508e472af442

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index 91e056ed83..1c1fa8a50e 100644
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -59,30 +59,30 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(TOOLCHAIN)" "1"
 	# Remove the first cross compiler which is not needed anymore.
-	find /tools/ -name "$(CROSSTARGET)*" | xargs rm -rfv
+	find $(TOOLS_DIR)/ -name "$(CROSSTARGET)*" | xargs rm -rfv
 
 	# Remove man and info pages.
-	rm -rfv /tools/{,share}/{info,man}
+	rm -rfv $(TOOLS_DIR)/{,share}/{info,man}
 
 	# Strip all binaries.
-	STRIP="/usr/bin/strip" $(DIR_SRC)/src/stripper /tools/
+	STRIP="/usr/bin/strip" $(DIR_SRC)/src/stripper $(TOOLS_DIR)/
 
 	# Fix ownership of the toolchain.
-	chown -R root:root /tools/
+	chown -R root:root $(TOOLS_DIR)/
 
 	# Update/create linker cache.
-	/tools/sbin/ldconfig
+	$(TOOLS_DIR)/sbin/ldconfig
 
 	# Set a marker when the toolchain was successfully built
-	touch /tools/.toolchain-successful
+	touch $(TOOLS_DIR)/.toolchain-successful
 else
-	mv -v /tools/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/$(BUILDTARGET)/bin/ld
+	mv -v $(TOOLS_DIR)/bin/{ld,ld-old}
+	mv -v $(TOOLS_DIR)/$(BUILDTARGET)/bin/{ld,ld-old}
+	mv -v $(TOOLS_DIR)/bin/{ld-new,ld}
+	ln -sv $(TOOLS_DIR)/bin/ld $(TOOLS_DIR)/$(BUILDTARGET)/bin/ld
 
 	gcc -dumpspecs | sed \
-		-e 's@/tools@@g' \
+		-e 's@$(TOOLS_DIR)@@g' \
 		-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
 		-e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \
 		$$(dirname $$(gcc -print-libgcc-file-name))/specs