From c25ea03dd6a04f33e1d6f089a0d93658a863235b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 21 Feb 2021 22:15:03 -0500 Subject: [PATCH] sim: set up build-time compiler settings Some sim dirs were already setting up CFLAGS_FOR_BUILD in inconsistent ways. Move it to a common place for reuse. --- sim/ChangeLog | 5 +++++ sim/aarch64/configure | 19 ++++++++++--------- sim/arm/configure | 19 ++++++++++--------- sim/avr/configure | 19 ++++++++++--------- sim/bfin/configure | 19 ++++++++++--------- sim/bpf/configure | 19 ++++++++++--------- sim/cr16/configure | 19 ++++++++++--------- sim/cris/configure | 19 ++++++++++--------- sim/d10v/configure | 19 ++++++++++--------- sim/erc32/configure | 19 ++++++++++--------- sim/frv/configure | 19 ++++++++++--------- sim/ft32/configure | 19 ++++++++++--------- sim/h8300/configure | 19 ++++++++++--------- sim/iq2000/configure | 19 ++++++++++--------- sim/lm32/configure | 19 ++++++++++--------- sim/m32c/configure | 19 ++++++++++--------- sim/m32r/configure | 19 ++++++++++--------- sim/m4/sim_ac_common.m4 | 15 ++++++++------- sim/m68hc11/configure | 19 ++++++++++--------- sim/mcore/configure | 19 ++++++++++--------- sim/microblaze/configure | 19 ++++++++++--------- sim/mips/configure | 19 ++++++++++--------- sim/mn10300/configure | 19 ++++++++++--------- sim/moxie/configure | 19 ++++++++++--------- sim/msp430/configure | 19 ++++++++++--------- sim/or1k/configure | 19 ++++++++++--------- sim/pru/configure | 19 ++++++++++--------- sim/riscv/configure | 19 ++++++++++--------- sim/rl78/configure | 19 ++++++++++--------- sim/rx/configure | 19 ++++++++++--------- sim/sh/configure | 19 ++++++++++--------- sim/v850/configure | 19 ++++++++++--------- 32 files changed, 313 insertions(+), 277 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index c34e214567d..4449c947274 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,8 @@ +2021-02-28 Mike Frysinger + + * m4/sim_ac_common.m4 (SIM_AC_COMMON): Delete CC_FOR_BUILD test. + Change CC_FOR_BUILD assignment. Define CFLAGS_FOR_BUILD. + 2021-02-28 Mike Frysinger * m4/sim_ac_common.m4 (SIM_AC_COMMON): Replace AR assignment and diff --git a/sim/aarch64/configure b/sim/aarch64/configure index c5a74525a19..02e4bce1571 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/arm/configure b/sim/arm/configure index 3e09e3c5179..753371571ad 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/avr/configure b/sim/avr/configure index b9d2c8e2e77..e0c4e478329 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/bfin/configure b/sim/bfin/configure index 1931ed157eb..404cc5c1053 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -690,6 +690,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6786,17 +6787,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11250,7 +11251,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11253 "configure" +#line 11254 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11356,7 +11357,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11359 "configure" +#line 11360 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/bpf/configure b/sim/bpf/configure index 6c0387675d2..ecb7e299a66 100755 --- a/sim/bpf/configure +++ b/sim/bpf/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6776,17 +6777,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11240,7 +11241,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11243 "configure" +#line 11244 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11346,7 +11347,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11349 "configure" +#line 11350 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/cr16/configure b/sim/cr16/configure index f1638a0af38..d76369fff9c 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/cris/configure b/sim/cris/configure index c2399342da8..1cf16783511 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -687,6 +687,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6777,17 +6778,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11241,7 +11242,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11244 "configure" +#line 11245 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11347,7 +11348,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11350 "configure" +#line 11351 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/d10v/configure b/sim/d10v/configure index e79b4037fd6..b8fd2dcb985 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/erc32/configure b/sim/erc32/configure index 8fbe618601e..62c6552ddfb 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -693,6 +693,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6758,17 +6759,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11222,7 +11223,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11225 "configure" +#line 11226 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11328,7 +11329,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11331 "configure" +#line 11332 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/frv/configure b/sim/frv/configure index 4eff45f5d73..2259c3267cd 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -688,6 +688,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6780,17 +6781,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11244,7 +11245,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11247 "configure" +#line 11248 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11350,7 +11351,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11353 "configure" +#line 11354 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/ft32/configure b/sim/ft32/configure index dfac27954e4..3e8f1a56609 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/h8300/configure b/sim/h8300/configure index 1c33058b42e..4a1fe16d4eb 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/iq2000/configure b/sim/iq2000/configure index e2bef6c1cfd..5803e493a05 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -687,6 +687,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6777,17 +6778,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11241,7 +11242,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11244 "configure" +#line 11245 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11347,7 +11348,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11350 "configure" +#line 11351 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/lm32/configure b/sim/lm32/configure index 33a44301413..27af268a4c9 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -687,6 +687,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6777,17 +6778,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11241,7 +11242,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11244 "configure" +#line 11245 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11347,7 +11348,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11350 "configure" +#line 11351 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m32c/configure b/sim/m32c/configure index d8ecb932f52..bcbe242c622 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -691,6 +691,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6756,17 +6757,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11220,7 +11221,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11223 "configure" +#line 11224 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11326,7 +11327,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11329 "configure" +#line 11330 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m32r/configure b/sim/m32r/configure index d256cb2c0e8..00ffcb3d42e 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6779,17 +6780,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11243,7 +11244,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11246 "configure" +#line 11247 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11349,7 +11350,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11352 "configure" +#line 11353 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4 index 0f3052abec3..f67c7f8be93 100644 --- a/sim/m4/sim_ac_common.m4 +++ b/sim/m4/sim_ac_common.m4 @@ -30,15 +30,16 @@ AC_C_BIGENDIAN AC_ARG_PROGRAM AC_PROG_INSTALL -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +dnl Setup toolchain settings for build-time tools.. +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi AC_SUBST(CC_FOR_BUILD) +AC_SUBST(CFLAGS_FOR_BUILD) AC_SUBST(CFLAGS) AC_CHECK_TOOL(AR, ar) diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index 2058d359dad..a0bb6451d8e 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -686,6 +686,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6766,17 +6767,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11230,7 +11231,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11233 "configure" +#line 11234 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11336,7 +11337,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11339 "configure" +#line 11340 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/mcore/configure b/sim/mcore/configure index e79b4037fd6..b8fd2dcb985 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/microblaze/configure b/sim/microblaze/configure index 3e09e3c5179..753371571ad 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/mips/configure b/sim/mips/configure index ba0e83f3c3a..9ffe51391f0 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -696,6 +696,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6796,17 +6797,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11260,7 +11261,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11263 "configure" +#line 11264 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11366,7 +11367,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11369 "configure" +#line 11370 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/mn10300/configure b/sim/mn10300/configure index 14553db7266..7d7aad29bb6 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -684,6 +684,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6772,17 +6773,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11236,7 +11237,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11239 "configure" +#line 11240 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11342,7 +11343,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11345 "configure" +#line 11346 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/moxie/configure b/sim/moxie/configure index ccd2541360c..f1e208fdbf8 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -690,6 +690,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6764,17 +6765,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11228,7 +11229,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11231 "configure" +#line 11232 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11334,7 +11335,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11337 "configure" +#line 11338 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/msp430/configure b/sim/msp430/configure index 9cf8dc84dd6..226c1379414 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/or1k/configure b/sim/or1k/configure index 1afcf93461b..ae9f9cc4513 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6776,17 +6777,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11240,7 +11241,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11243 "configure" +#line 11244 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11346,7 +11347,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11349 "configure" +#line 11350 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/pru/configure b/sim/pru/configure index b9d2c8e2e77..e0c4e478329 100755 --- a/sim/pru/configure +++ b/sim/pru/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/riscv/configure b/sim/riscv/configure index 3e65cc98df5..7583f012f2b 100755 --- a/sim/riscv/configure +++ b/sim/riscv/configure @@ -687,6 +687,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6768,17 +6769,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11232,7 +11233,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11235 "configure" +#line 11236 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11338,7 +11339,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11341 "configure" +#line 11342 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/rl78/configure b/sim/rl78/configure index d24f2282aee..80b0c9dfe70 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -691,6 +691,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6756,17 +6757,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11220,7 +11221,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11223 "configure" +#line 11224 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11326,7 +11327,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11329 "configure" +#line 11330 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/rx/configure b/sim/rx/configure index e524b5fe45c..1415b0b9d51 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -691,6 +691,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6761,17 +6762,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11225,7 +11226,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11228 "configure" +#line 11229 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11331,7 +11332,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11334 "configure" +#line 11335 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/sh/configure b/sim/sh/configure index e79b4037fd6..b8fd2dcb985 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -689,6 +689,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6763,17 +6764,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11227,7 +11228,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11230 "configure" +#line 11231 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11333,7 +11334,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11336 "configure" +#line 11337 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/v850/configure b/sim/v850/configure index 066e3621593..a62a7c04472 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -687,6 +687,7 @@ PACKAGE C_DIALECT RANLIB AR +CFLAGS_FOR_BUILD CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT @@ -6769,17 +6770,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# Put a plausible default for CC_FOR_BUILD in Makefile. -if test -z "$CC_FOR_BUILD"; then - if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' - else - CC_FOR_BUILD=gcc - fi +if test "x$cross_compiling" = "xno"; then + : "${CC_FOR_BUILD:=\$(CC)}" + : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" +else + : "${CC_FOR_BUILD:=gcc}" + : "${CFLAGS_FOR_BUILD:=-g -O}" fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11233,7 +11234,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11236 "configure" +#line 11237 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11339,7 +11340,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11342 "configure" +#line 11343 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -- 2.30.2