Changeset 3127 for trunk/kBuild/env.sh

Timestamp:

Nov 22, 2017, 9:15:12 PM (8 years ago)

Author:

bird

Message:

kBuild/env.sh: Attempt at correctly detecting debian x32 cross builds.

File:

• trunk/kBuild/env.sh (modified) (1 diff)

trunk/kBuild/env.sh

@@ -340 +340 @@
             # Try detect debian x32.
             if test "$KBUILD_HOST" = "linux"; then 
-                case "`uname -v`" in 
-                    *Debian*+x32+*) KBUILD_HOST_ARCH=x32 ;;
+                if test -z "${DEB_HOST_ARCH}"; then
+                    DEB_HOST_ARCH=`dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null`;
+                    if test -z "${DEB_HOST_ARCH}"; then
+                        DEB_HOST_ARCH=`dpkg --print-architecture 2> /dev/null`;
+                    fi
+                fi
+                case "${DEB_HOST_ARCH}" in
+                    "x32")
+                        KBUILD_HOST_ARCH=x32
+                        ;;
+                    "") case "`uname -v`" in
+                            *Debian*+x32+*) KBUILD_HOST_ARCH=x32 ;;
+                        esac
+                        ;;
                 esac
             fi