Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc...

[people/teissler/ipfire-2.x.git] / lfs / cleanup-toolchain

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index 79d5db40a8a9149ac4ba45d2691c0556e7aaea9b..a200c2b6d5734decb8aa37f318c458f8db529a97 100644 (file)
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -29,11 +29,7 @@ VER        = ipfire
 THISAPP    = cleanup-toolchain
 TARGET     = $(DIR_INFO)/$(THISAPP)-$(PASS)-tools
 
-ifeq "$(MACHINE_TYPE)" "arm"
-       GCC_VER = 4.1.2
-else
-       GCC_VER = 4.0.4
-endif
+GCC_VER    = 4.1.2
 
 ###############################################################################
 # Top-level Rules
@@ -71,6 +67,9 @@ ifeq "$(PASS)" "2"
        -strip --strip-unneeded /tools/{,s}bin/*
        rm -rfv /tools/{info,man} /usr/local/man
        chown -R root:root /tools
+
+       # Install CPUID header.
+       install -m 644 -v $(DIR_SRC)/headers/cpuid.h /tools/include
 endif
 ifeq "$(PASS)" "3"
        mv -v /tools/bin/{ld,ld-old}