Skip to content

Commit

Permalink
Run all configure scripts using ${CONFIG_SHELL}
Browse files Browse the repository at this point in the history 
... as its help message says in menuconfig.

Signed-off-by: Alexey Neyman <stilor@att.net>
  • Loading branch information
@stilor
stilor committed Jan 25, 2017
1 parent b5d0e39 commit 7186e39
Show file tree
Hide file tree
Showing 25 changed files with 55 additions and 19 deletions.
3 changes: 3 additions & 0 deletions scripts/build/binutils/binutils.sh
View file
Expand Up @@ -216,6 +216,7 @@ do_binutils_backend() {
CFLAGS="${cflags}" \
CXXFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down Expand Up @@ -300,6 +301,7 @@ do_elf2flt_backend() {
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
LIBS="-ldl" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down Expand Up @@ -359,6 +361,7 @@ do_binutils_for_target() {
[ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls")

CT_DoExecLog CFG \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
Expand Down
34 changes: 18 additions & 16 deletions scripts/build/cc/100-gcc.sh
View file
Expand Up @@ -595,6 +595,7 @@ do_gcc_core_backend() {
CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down Expand Up @@ -1109,23 +1110,24 @@ do_gcc_backend() {
cflags="$cflags "-fbracket-depth=512
fi

CT_DoExecLog CFG \
CC_FOR_BUILD="${CT_BUILD}-gcc" \
CFLAGS="${cflags}" \
CXXFLAGS="${cflags}" \
LDFLAGS="${final_LDFLAGS[*]}" \
CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
CT_DoExecLog CFG \
CC_FOR_BUILD="${CT_BUILD}-gcc" \
CFLAGS="${cflags}" \
CXXFLAGS="${cflags}" \
LDFLAGS="${final_LDFLAGS[*]}" \
CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \
LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
--target=${CT_TARGET} \
--prefix="${prefix}" \
${CC_SYSROOT_ARG} \
"${extra_config[@]}" \
--with-local-prefix="${CT_SYSROOT_DIR}" \
--enable-long-long \
--build=${CT_BUILD} \
--host=${host} \
--target=${CT_TARGET} \
--prefix="${prefix}" \
${CC_SYSROOT_ARG} \
"${extra_config[@]}" \
--with-local-prefix="${CT_SYSROOT_DIR}" \
--enable-long-long \
"${CT_CC_GCC_EXTRA_CONFIG_ARRAY[@]}"

if [ "${CT_CANADIAN}" = "y" ]; then
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/100-gmp.sh
View file
Expand Up @@ -92,6 +92,7 @@ do_gmp_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags} -fexceptions" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/110-mpfr.sh
View file
Expand Up @@ -137,6 +137,7 @@ do_mpfr_backend() {
CC="${host}-gcc" \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/121-isl.sh
View file
Expand Up @@ -100,6 +100,7 @@ do_isl_backend() {
CFLAGS="${cflags}" \
CXXFLAGS="${cxxflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/isl-${CT_ISL_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/130-cloog.sh
View file
Expand Up @@ -98,6 +98,7 @@ do_cloog_backend() {
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
LIBS="-lm" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/cloog-${CT_CLOOG_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/140-mpc.sh
View file
Expand Up @@ -87,6 +87,7 @@ do_mpc_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/mpc-${CT_MPC_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/200-libelf.sh
View file
Expand Up @@ -131,6 +131,7 @@ do_libelf_backend() {
RANLIB="${host}-ranlib" \
CFLAGS="${cflags} -fPIC" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/libelf-${CT_LIBELF_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/210-expat.sh
View file
Expand Up @@ -94,6 +94,7 @@ do_expat_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/expat-${CT_EXPAT_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/220-ncurses.sh
View file
Expand Up @@ -147,6 +147,7 @@ do_ncurses_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${host} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/320-libiconv.sh
View file
Expand Up @@ -85,6 +85,7 @@ do_libiconv_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}/configure" \
--build=${CT_BUILD} \
--host="${host}" \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_libs/330-gettext.sh
View file
Expand Up @@ -106,6 +106,7 @@ do_gettext_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/configure" \
--build=${CT_BUILD} \
--host="${host}" \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_tools/050-make.sh
View file
Expand Up @@ -55,6 +55,7 @@ do_make_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"
Expand Down
1 change: 1 addition & 0 deletions scripts/build/companion_tools/100-m4.sh
View file
Expand Up @@ -57,6 +57,7 @@ do_m4_backend() {
CT_DoExecLog CFG \
CFLAGS="${cflags}" \
LDFLAGS="${ldflags}" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"
Expand Down
3 changes: 2 additions & 1 deletion scripts/build/companion_tools/200-autoconf.sh
View file
Expand Up @@ -40,7 +40,8 @@ do_autoconf_backend() {
# For reference see:
# http://www.gnu.org/software/autoconf/manual/autoconf.html#CONFIG_005fSHELL
CT_DoLog EXTRA "Configuring autoconf"
CT_DoExecLog CFG ${CONFIG_SHELL} \
CT_DoExecLog CFG \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"
Expand Down
4 changes: 3 additions & 1 deletion scripts/build/companion_tools/300-automake.sh
View file
Expand Up @@ -36,7 +36,9 @@ do_automake_backend() {
done

CT_DoLog EXTRA "Configuring automake"
CT_DoExecLog CFG "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \
CT_DoExecLog CFG \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"

Expand Down
4 changes: 3 additions & 1 deletion scripts/build/companion_tools/400-libtool.sh
View file
Expand Up @@ -36,7 +36,9 @@ do_libtool_backend() {
done

CT_DoLog EXTRA "Configuring libtool"
CT_DoExecLog CFG "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \
CT_DoExecLog CFG \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \
--host="${host}" \
--prefix="${prefix}"

Expand Down
3 changes: 3 additions & 0 deletions scripts/build/debug/300-gdb.sh
View file
Expand Up @@ -128,6 +128,7 @@ do_debug_gdb_build() {
CC="${CC_for_gdb}" \
CXX="${CXX_for_gdb}" \
LD="${LD_for_gdb}" \
${CONFIG_SHELL} \
"${gdb_src_dir}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
Expand Down Expand Up @@ -239,6 +240,7 @@ do_debug_gdb_build() {
CC="${CC_for_gdb}" \
CXX="${CXX_for_gdb}" \
LD="${LD_for_gdb}" \
${CONFIG_SHELL} \
"${gdb_src_dir}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
Expand Down Expand Up @@ -309,6 +311,7 @@ do_debug_gdb_build() {
CPP="${CT_TARGET}-cpp" \
LD="${CT_TARGET}-ld" \
LDFLAGS="${gdbserver_LDFLAGS}" \
${CONFIG_SHELL} \
"${gdb_src_dir}/gdb/gdbserver/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
Expand Down
2 changes: 2 additions & 0 deletions scripts/build/debug/400-ltrace.sh
View file
Expand Up @@ -42,9 +42,11 @@ do_debug_ltrace_build() {
HOST="${ltrace_host}" \
HOST_OS="${CT_TARGET_KERNEL}" \
CFLAGS="${CT_TARGET_CFLAGS}" \
${CONFIG_SHELL} \
./configure --prefix=/usr
else
CT_DoExecLog CFG \
${CONFIG_SHELL} \
./configure \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/debug/500-strace.sh
View file
Expand Up @@ -22,6 +22,7 @@ do_debug_strace_build() {
CC="${CT_TARGET}-${CT_CC}" \
CPP="${CT_TARGET}-cpp" \
LD="${CT_TARGET}-ld" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/strace-${CT_STRACE_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/libc/avr-libc.sh
View file
Expand Up @@ -22,6 +22,7 @@ do_libc_configure() {
CT_DoLog EXTRA "Configuring C library"

CT_DoExecLog CFG \
${CONFIG_SHELL} \
./configure \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/libc/glibc.sh
View file
Expand Up @@ -502,6 +502,7 @@ do_libc_locales() {

CT_DoExecLog CFG \
CFLAGS="${glibc_cflags}" \
${CONFIG_SHELL} \
"${src_dir}/configure" \
--prefix=/usr \
--cache-file="$(pwd)/config.cache" \
Expand Down
4 changes: 4 additions & 0 deletions scripts/build/libc/mingw.sh
View file
Expand Up @@ -48,6 +48,7 @@ do_libc_start_files() {

do_set_mingw_install_prefix
CT_DoExecLog CFG \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-headers/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
Expand Down Expand Up @@ -93,6 +94,7 @@ do_mingw_tools() {
CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-tools/${f}"

CT_DoExecLog CFG \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-tools/${f}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
Expand All @@ -119,6 +121,7 @@ do_libc() {

do_set_mingw_install_prefix
CT_DoExecLog CFG \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-crt/configure" \
--with-sysroot=${CT_SYSROOT_DIR} \
--prefix=${MINGW_INSTALL_PREFIX} \
Expand Down Expand Up @@ -158,6 +161,7 @@ do_pthreads() {
CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-winpthreads"

CT_DoExecLog CFG \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-libraries/winpthreads/configure" \
--with-sysroot=${CT_SYSROOT_DIR} \
--prefix=${MINGW_INSTALL_PREFIX} \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/libc/musl.sh
View file
Expand Up @@ -110,6 +110,7 @@ do_libc_backend_once() {
CT_DoExecLog CFG \
CFLAGS="${extra_cflags[*]}" \
CROSS_COMPILE="${CT_TARGET}-" \
${CONFIG_SHELL} \
${src_dir}/configure \
--host="${multi_target}" \
--target="${multi_target}" \
Expand Down
1 change: 1 addition & 0 deletions scripts/build/libc/newlib.sh
View file
Expand Up @@ -130,6 +130,7 @@ ENABLE_TARGET_OPTSPACE:target-optspace
CFLAGS_FOR_TARGET="${cflags_for_target}" \
AR_FOR_TARGET="`which ${CT_TARGET}-gcc-ar`" \
RANLIB_FOR_TARGET="`which ${CT_TARGET}-gcc-ranlib`" \
${CONFIG_SHELL} \
"${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/configure" \
--host=${CT_BUILD} \
--target=${CT_TARGET} \
Expand Down

0 comments on commit 7186e39

Please sign in to comment.