diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index 7f98903..c716a3a 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -622,6 +622,18 @@ hardware="$hardware [$3]" sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/dv-\1.o/g'`" +# mingw does not support sockser +# Check this independent of --enable-sim-hardware because SIM_DV_SOCKSER_O +# may be used by simulators which "always" are enabled. +SIM_DV_SOCKSER_O="" +case ${host} in + *mingw*) ;; + *) SIM_DV_SOCKSER_O="dv-sockser.o" + AC_DEFINE_UNQUOTED( + [HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.]) + ;; +esac +AC_SUBST(SIM_DV_SOCKSER_O) AC_ARG_ENABLE(sim-hardware, [ --enable-sim-hardware=LIST Specify the hardware to be included in the build.], [ @@ -647,16 +659,6 @@ else *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";; esac done - # mingw does not support sockser - SIM_DV_SOCKSER_O="" - case ${host} in - *mingw*) ;; - *) SIM_DV_SOCKSER_O="dv-sockser.o" - AC_DEFINE_UNQUOTED( - [HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.]) - ;; - esac - AC_SUBST(SIM_DV_SOCKSER_O) fi if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"