From bb821551c5a9942473b035fb7fddf45663b0123f Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Mon, 2 Nov 2015 16:55:44 -0800
Subject: linux: Set CROSS_COMPILE while building/checking headers

Some architectures, like arc and blackfin set CROSS_COMPILE to a default
if it is not set on the command-line.

Since we are building the cross-compiler, we need to ALWAYS set
CROSS_COMPILE, since building/checking headers is done after the GCC
PASS1 step.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 5f32680..2ebb03c 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -119,6 +119,7 @@ do_kernel_install() {
     CT_DoLog EXTRA "Installing kernel headers"
     CT_DoExecLog ALL                                    \
     make -C "${kernel_path}"                            \
+         CROSS_COMPILE="${CT_TARGET}-"                  \
          O="${CT_BUILD_DIR}/build-kernel-headers"       \
          ARCH=${kernel_arch}                            \
          INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"       \
@@ -129,6 +130,7 @@ do_kernel_install() {
         CT_DoLog EXTRA "Checking installed headers"
         CT_DoExecLog ALL                                    \
         make -C "${kernel_path}"                            \
+             CROSS_COMPILE="${CT_TARGET}-"                  \
              O="${CT_BUILD_DIR}/build-kernel-headers"       \
              ARCH=${kernel_arch}                            \
              INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"       \
-- 
cgit v0.10.2-6-g49f6


From 3b854d493909c2373571cf34f7c10542f53b82c3 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Mon, 2 Nov 2015 17:01:20 -0800
Subject: uClibc: Don't use CROSS, use CROSS_COMPILE instead

As per:
http://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/Makefile.help?id=044843f002f666db3bc06c513ed6291a00ad1225

CROSS= is for compatibility, but we plan on dropping older uClibc
versions, and adding uClibc-ng and uClibc-snapshot support.

Use CROSS_COMPILE instead.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index d270915..e6974b3 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -98,7 +98,7 @@ do_libc_start_files() {
     # newer ones that are referenced are not available
     CT_DoLog EXTRA "Applying configuration"
     CT_DoYes "" |CT_DoExecLog ALL                                   \
-                 make CROSS="${cross}"                              \
+                 make CROSS_COMPILE="${cross}"                      \
                  PREFIX="${CT_SYSROOT_DIR}/"                        \
                  LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
                  oldconfig
@@ -106,7 +106,7 @@ do_libc_start_files() {
     CT_DoLog EXTRA "Building headers"
     CT_DoExecLog ALL                                        \
     make ${CT_LIBC_UCLIBC_VERBOSITY}                        \
-         CROSS="${cross}"                                   \
+         CROSS_COMPILE="${cross}"                           \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
          headers
@@ -120,7 +120,7 @@ do_libc_start_files() {
     CT_DoLog EXTRA "Installing headers"
     CT_DoExecLog ALL                                        \
     make ${CT_LIBC_UCLIBC_VERBOSITY}                        \
-         CROSS="${cross}"                                   \
+         CROSS_COMPILE="${cross}"                           \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
          ${install_rule}
@@ -129,7 +129,7 @@ do_libc_start_files() {
         CT_DoLog EXTRA "Building start files"
         CT_DoExecLog ALL                                        \
         make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}}           \
-             CROSS="${cross}"                                   \
+             CROSS_COMPILE="${cross}"                           \
              PREFIX="${CT_SYSROOT_DIR}/"                        \
              STRIPTOOL=true                                     \
              ${CT_LIBC_UCLIBC_VERBOSITY}                        \
@@ -180,7 +180,7 @@ do_libc() {
     # use LIBC_EXTRA_CFLAGS here.
     CT_DoLog EXTRA "Applying configuration"
     CT_DoYes "" |CT_DoExecLog CFG                                   \
-                 make CROSS=${CT_TARGET}-                           \
+                 make CROSS_COMPILE=${CT_TARGET}-                   \
                  PREFIX="${CT_SYSROOT_DIR}/"                        \
                  LOCALE_DATA_FILENAME="${uclibc_local_tarball}.tgz" \
                  oldconfig
@@ -191,7 +191,7 @@ do_libc() {
     CT_DoLog EXTRA "Building C library"
     CT_DoExecLog ALL                                        \
     make -j1                                                \
-         CROSS=${CT_TARGET}-                                \
+         CROSS_COMPILE=${CT_TARGET}-                        \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          STRIPTOOL=true                                     \
          ${CT_LIBC_UCLIBC_VERBOSITY}                        \
@@ -199,7 +199,7 @@ do_libc() {
          pregen
     CT_DoExecLog ALL                                        \
     make ${CT_LIBC_UCLIBC_PARALLEL:+${JOBSFLAGS}}           \
-         CROSS=${CT_TARGET}-                                \
+         CROSS_COMPILE=${CT_TARGET}-                        \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          STRIPTOOL=true                                     \
          ${CT_LIBC_UCLIBC_VERBOSITY}                        \
@@ -222,7 +222,7 @@ do_libc() {
     #
     CT_DoLog EXTRA "Installing C library"
     CT_DoExecLog ALL                                        \
-    make CROSS=${CT_TARGET}-                                \
+    make CROSS_COMPILE=${CT_TARGET}-                        \
          PREFIX="${CT_SYSROOT_DIR}/"                        \
          STRIPTOOL=true                                     \
          ${CT_LIBC_UCLIBC_VERBOSITY}                        \
@@ -384,7 +384,7 @@ mungeuClibcConfig() {
     #  " so people may need to update their paths slightly
     quoted_kernel_source=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/include/?$,,; s,/,\\/,g;')
     quoted_headers_dir=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/,\\/,g;')
-    # CROSS_COMPILER_PREFIX is left as is, as the CROSS parameter is forced on the command line
+    # CROSS_COMPILER_PREFIX is left as is, as the CROSS_COMPILE parameter is forced on the command line
     # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX, wich is the correct value of ${PREFIX}/${TARGET}
     # Some (old) versions of uClibc use KERNEL_SOURCE (which is _wrong_), and
     # newer versions use KERNEL_HEADERS (which is right).
-- 
cgit v0.10.2-6-g49f6