Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-28 12:02:13 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-28 12:02:13 +0200
commite628425f557d0209a13fbb0fd232020b9100e4d8 (patch)
treef1ed36ef0bfde3679e221dc274510139e7e91a34
parent2f51d2187e9b233158f7f75bd804bfc2b59d5ab8 (diff)
parent93c608027867116b306a57e19636efbb802ab95a (diff)
Merge branch 'scripts' into linux-next
-rwxr-xr-xscripts/run_oldconfig.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/run_oldconfig.sh b/scripts/run_oldconfig.sh
index de637afa3a..c3c0651ab8 100755
--- a/scripts/run_oldconfig.sh
+++ b/scripts/run_oldconfig.sh
@@ -434,11 +434,12 @@ for config in $config_files; do
cross_arch="${config%%/*}"
;;
esac
+ [ "$cross_arch" = "$(uname -m)" ] && cross_arch=
cross_compile="${CROSS_COMPILE-${cross_arch}-suse-linux-${cross_extra}}"
- if [ -n "$cross_compile" -a -x /usr/bin/${cross_compile}gcc ]; then
+ if [ -n "$cross_arch" -a -x /usr/bin/${cross_compile}gcc ]; then
MAKE_ARGS="$MAKE_ARGS CROSS_COMPILE=$cross_compile"
fi
- if [ -n "$CC" ]; then
+ if [ -n "$CC" -a -z "$cross_arch" ]; then
MAKE_ARGS="$MAKE_ARGS CC=$CC"
fi
if $silent; then