Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-07-27 17:47:00 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-07-27 17:47:00 +0200
commit1ef0ba14192cc1b1a2b5a734aa2e037f017053db (patch)
tree469568da2136aa30da76ec13379e53fc876f37e2
parentf97ca49b51e62a47cb0d5195aed75056f1ccdb5b (diff)
parent93c608027867116b306a57e19636efbb802ab95a (diff)
Merge branch 'scripts' into packaging
-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 3411750666..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" -a -z "$cross_compile" ]; then
+ if [ -n "$CC" -a -z "$cross_arch" ]; then
MAKE_ARGS="$MAKE_ARGS CC=$CC"
fi
if $silent; then