From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 24 Jan 2017 20:42:16 +0000 (-0500)
Subject: jjb: Fix cross build of lttng-modules
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e0552fd7f3c81d250694e87ff1b4a153d9148910;p=lttng-ci.git

jjb: Fix cross build of lttng-modules

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 7e8aa74..1798b9f 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -75,7 +75,7 @@ prepare_lnx_sources() {
     echo "CONFIG_KALLSYMS_ALL=y" >> "${outdir}"/.config
 
 
-    make ${koutput} olddefconfig CC=$CC
+    make ${koutput} $oldconf_target CC=$CC
     make ${koutput} modules_prepare CC=$CC
 
     # Version specific tasks
@@ -204,6 +204,8 @@ if [ "x${cross_arch:-}" != "x" ]; then
     export ARCH="${karch}"
     export CROSS_COMPILE="${cross_compile}"
 
+    oldconf_target="olddefconfig"
+
 # Set arch specific values if we are not cross compiling
 elif [ "x${arch:-}" != "x" ]; then
 
@@ -253,6 +255,8 @@ elif [ "x${arch:-}" != "x" ]; then
     # Use gcc 4.9, older kernel don't build with gcc 5
     CC=gcc-4.9
 
+    oldconf_target="silentoldconfig"
+
 else
     echo "Not arch or cross_arch specified"
     exit 1