[1/3] sim: adjust sim_hw options style

Message ID 20221105035047.11654-1-vapier@gentoo.org
State Committed
Headers
Series [1/3] sim: adjust sim_hw options style |

Commit Message

Mike Frysinger Nov. 5, 2022, 3:50 a.m. UTC
  We use uppercase for other variables, and are already turning it to
uppercase in the arch-subdir.mk, so convert it in the configure step.
---
 sim/Makefile.in                  | 4 ++--
 sim/arch-subdir.mk.in            | 4 ++--
 sim/configure                    | 6 ++++--
 sim/m4/sim_ac_option_hardware.m4 | 6 ++++--
 4 files changed, 12 insertions(+), 8 deletions(-)
  

Patch

diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index 616e06ec453f..cbe3fca88654 100644
--- a/sim/arch-subdir.mk.in
+++ b/sim/arch-subdir.mk.in
@@ -77,7 +77,7 @@  CGENDIR = @cgendir@
 
 SIM_INLINE = @SIM_INLINE@
 
-SIM_HW_CFLAGS = @sim_hw_cflags@
-SIM_HW_SOCKSER = @sim_hw_sockser@
+SIM_HW_CFLAGS = @SIM_HW_CFLAGS@
+SIM_HW_SOCKSER = @SIM_HW_SOCKSER@
 SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER)
 @SIM_ENABLE_HW_FALSE@SIM_HW_OBJS =
diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4
index d1acc6a7403d..5216d6ba5545 100644
--- a/sim/m4/sim_ac_option_hardware.m4
+++ b/sim/m4/sim_ac_option_hardware.m4
@@ -36,6 +36,8 @@  else
 fi
 AM_CONDITIONAL([SIM_ENABLE_HW], [test "$enable_sim_hardware" = "yes"])
 AC_MSG_RESULT(${enable_sim_hardware})
-AC_SUBST(sim_hw_cflags)
-AC_SUBST(sim_hw_sockser)
+SIM_HW_CFLAGS=$sim_hw_cflags
+AC_SUBST(SIM_HW_CFLAGS)
+SIM_HW_SOCKSER=$sim_hw_sockser
+AC_SUBST(SIM_HW_SOCKSER)
 ])