From d281d743e9e30c5b6f6081b105a2501a1f589430 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Sun, 10 Nov 2013 17:00:21 +0000 Subject: [PATCH] Fixed plugins compilation with gcc 4.8.1 --- bochs/Makefile.in | 4 ++-- bochs/configure.in | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bochs/Makefile.in b/bochs/Makefile.in index c085720be..e12513001 100644 --- a/bochs/Makefile.in +++ b/bochs/Makefile.in @@ -181,7 +181,7 @@ bochs@EXE@: @IODEV_LIB_VAR@ @DISPLAY_LIB_VAR@ @HDIMAGE_LIB_VAR@ @USB_LIB_VAR@ @N @IODEV_LIB_VAR@ @DISPLAY_LIB_VAR@ @HDIMAGE_LIB_VAR@ @USB_LIB_VAR@ @NETWORK_LIB_VAR@ @SOUND_LIB_VAR@ \ @DEBUGGER_VAR@ cpu/libcpu.a cpu/cpudb/libcpudb.a \ memory/libmemory.a gui/libgui.a \ - @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_VAR@ \ + @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_LIB@ \ @GDBSTUB_VAR@ @FPU_VAR@ \ @NONPLUGIN_GUI_LINK_OPTS@ \ $(MCH_LINK_FLAGS) \ @@ -209,7 +209,7 @@ bochs@EXE@: @IODEV_LIB_VAR@ @DISPLAY_LIB_VAR@ @HDIMAGE_LIB_VAR@ @USB_LIB_VAR@ @N $(BX_OBJS) bochs.exp $(SIMX86_OBJS) \ @IODEV_LIB_VAR@ @DISPLAY_LIB_VAR@ @HDIMAGE_LIB_VAR@ @USB_LIB_VAR@ @NETWORK_LIB_VAR@ @SOUND_LIB_VAR@ \ cpu/libcpu.a cpu/cpudb/libcpudb.a memory/libmemory.a gui/libgui.a \ - @DEBUGGER_VAR@ @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_VAR@ \ + @DEBUGGER_VAR@ @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_LIB@ \ @GDBSTUB_VAR@ @FPU_VAR@ \ $(GUI_LINK_OPTS) \ $(MCH_LINK_FLAGS) \ diff --git a/bochs/configure.in b/bochs/configure.in index 59a52b2ac..6c90bb965 100644 --- a/bochs/configure.in +++ b/bochs/configure.in @@ -442,10 +442,11 @@ if test "$bx_plugins" = 1; then have_ltdl=0 AC_CHECK_HEADER(ltdl.h, [AC_CHECK_LIB(ltdl, lt_dlinit, [have_ltdl=1]])) if test "$have_ltdl" = 1; then - PLUGIN_VAR="-lltdl" + PLUGIN_LIB="-lltdl" AC_DEFINE(BX_HAVE_LTDL,1) else PLUGIN_VAR="ltdl.o" + PLUGIN_LIB="ltdl.o" fi PLUGIN_TARGET=bochs_plugins INSTALL_PLUGINS_VAR=install_libtool_plugins @@ -2871,6 +2872,7 @@ AC_SUBST(IODEV_PLUGIN_OBJS) AC_SUBST(IODEV_EXT_NON_PLUGIN_OBJS) AC_SUBST(IODEV_EXT_PLUGIN_OBJS) AC_SUBST(PLUGIN_VAR) +AC_SUBST(PLUGIN_LIB) AC_SUBST(PLUGIN_TARGET) AC_SUBST(INSTALL_PLUGINS_VAR)