From b9afd28f7838c4178cfe22005f68fb696a0a4083 Mon Sep 17 00:00:00 2001 From: orbea Date: May 04 2023 17:07:09 +0000 Subject: build system: configure: use CONFIG_SHELL --- diff --git a/Makefile.in b/Makefile.in index 4e0f9e9..e6b15e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,7 +53,7 @@ COMPILER = @compiler@ TOOLCHAIN = @toolchain@ SYSROOT = @sysroot@ CROSS_COMPILE = @cross_compile@ -SHELL = @shell@ +SHELL = @config_shell@ PREFIX = @prefix@ EXEC_PREFIX = @exec_prefix@ diff --git a/configure b/configure index e79d154..f4bddfb 100755 --- a/configure +++ b/configure @@ -275,7 +275,7 @@ init_vars() mb_toolchain=$TOOLCHAIN mb_sysroot=$SYSROOT mb_cross_compile=$CROSS_COMPILE - mb_shell=$SHELL + mb_config_shell=$CONFIG_SHELL # pkgconf mb_pkgconf=$PKGCONF @@ -685,8 +685,8 @@ common_defaults() fi # shell - if [ -z "$mb_shell" ]; then - mb_shell='/bin/sh' + if [ -z "$mb_config_shell" ]; then + mb_config_shell='/bin/sh' fi # inherited cflags & ldflags @@ -1207,7 +1207,7 @@ for arg ; do mb_sysroot=${arg#*=} ;; --shell=*) - mb_shell=${arg#*=} + mb_config_shell=${arg#*=} ;; --debug) mb_debug=yes diff --git a/sofort/config/config.vars b/sofort/config/config.vars index 0c01a29..37f4624 100644 --- a/sofort/config/config.vars +++ b/sofort/config/config.vars @@ -54,7 +54,7 @@ zealous sysroot freestanding cross_compile -shell +config_shell pkgconf pkgconfig