]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Allow building for x86_64
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 22 Aug 2015 10:24:20 +0000 (12:24 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 22 Aug 2015 10:24:20 +0000 (12:24 +0200)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/stage2
make.sh
tools/make-functions

index 3203983e287a386515a787e278d41f2bde2a4677..3244fa36fa79afc8b946a100173c9ce9784ee5c9 100644 (file)
@@ -63,7 +63,12 @@ $(TARGET) :
 
        # Symlink /var/run -> /run.
        ln -svf ../run /var/run
-       
+
+ifeq "$(MACHINE)" "x86_64"
+       ln -svf lib /lib64
+       ln -svf lib /usr/lib64
+endif
+
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
        -ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
diff --git a/make.sh b/make.sh
index 4f6eedb0f4bdc6ae8a20c2fbb5d887e567252c7b..a4e1f29358ec47e38712a11d3b8d71ba0a34e60d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -245,6 +245,11 @@ prepareenv() {
 buildtoolchain() {
     local error=false
     case "${TARGET_ARCH}:${BUILD_ARCH}" in
+        # x86_64
+        x86_64:x86_64)
+             # This is working.
+             ;;
+
         # x86
         i586:i586|i586:i686|i586:x86_64)
             # These are working.
@@ -413,6 +418,9 @@ buildipfire() {
   ipfiremake iptables
 
   case "${TARGET_ARCH}" in
+       x86_64)
+               # No kernel, yet.
+               ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
index 4fbb530f45f4f15dd057b760351b9b536e9f6ee9..01521552584ed1e7691ad50e1dd3f0b168805ac8 100644 (file)
@@ -68,6 +68,12 @@ configure_target() {
        fi
 
        case "${target_arch}" in
+               x86_64)
+                       BUILDTARGET="${TARGET_ARCH}-unknown-linux-gnu"
+                       CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"
+                       CFLAGS_ARCH="-m64 -mtune=generic"
+                       ;;
+
                i586)
                        BUILDTARGET="${target_arch}-pc-linux-gnu"
                        CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"