Merge branch 'ssp'

[ipfire-3.x.git] / lfs / adjust-toolchain

diff --git a/lfs/adjust-toolchain b/lfs/adjust-toolchain
index db81e8b392769f6c78eb133ecfae2b47abccbece..0c9e4d72f5487e988960b3798dfd2e7ddb4bb1a5 100644 (file)
--- a/lfs/adjust-toolchain
+++ b/lfs/adjust-toolchain
@@ -50,18 +50,10 @@ $(TARGET) :
        @$(PREBUILD)
        
 ifeq "$(STAGE)" "toolchain"
-       mv -v $(TOOLS_DIR)/bin/{ld,ld-old}
-       mv -v $(TOOLS_DIR)/$$(gcc -dumpmachine)/bin/{ld,ld-old}
-       cp -v $(TOOLS_DIR)/bin/{ld-new,ld}
-       ln -sv $(TOOLS_DIR)/bin/ld $(TOOLS_DIR)/$$(gcc -dumpmachine)/bin/ld
-       
-       gcc -dumpspecs | sed 's@$(LINKER)@$(TOOLS_DIR)&@g' \
-               > `dirname $$(gcc -print-libgcc-file-name)`/specs
-       
-       GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \
-       find $${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; && \
-       rm -vf `grep -l "DO NOT EDIT THIS FILE" $${GCC_INCLUDEDIR}/*` && \
-       unset GCC_INCLUDEDIR  
+       $(IFS_TARGET)-gcc -dumpspecs | sed \
+               -e 's@$(LINKER)@$(TOOLS_DIR)&@g' \
+               -e "/^\*cpp:$$/{n;s,$$, -isystem $(TOOLS_DIR)/include,}" \
+               > $$(dirname $$($(IFS_TARGET)-gcc -print-libgcc-file-name))/specs
 endif
 
 ifeq "$(STAGE)" "base"
@@ -71,10 +63,10 @@ ifeq "$(STAGE)" "base"
        ln -sfv $(TOOLS_DIR)/bin/ld $(TOOLS_DIR)/$$(gcc -dumpmachine)/bin/ld
        
        gcc -dumpspecs | sed \
-    -e 's@$(TOOLS_DIR)$(LINKER)@$(LINKER)@g' \
-    -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
-    -e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \
-    `dirname $$(gcc --print-libgcc-file-name)`/specs
+               -e "/^\*link:$$/{n;s,$$, -L/usr/lib,}" \
+               -e 's@$(TOOLS_DIR)$(LINKER)@$(LINKER)@g' \
+               -e '/^\*cpp:$$/{n;s,$$, -isystem /usr/include,}' \
+               > $$(dirname $$(gcc --print-libgcc-file-name))/myspecs
 endif
-       
+
        @$(POSTBUILD)