Fix mtstress and vpi-dump build on macOS

Author: nickg

configure.ac

@@ -90,10 +90,10 @@ CHECK_DYNAMIC_LIST(
 AC_SUBST(EXPORT_LDFLAGS)
 
 AX_CHECK_COMPILE_FLAG([-fPIC],
-  [PIC_FLAG="-fPIC"],
-  [PIC_FLAG=""],
+  [SHLIB_CFLAGS="-fPIC"],
+  [SHLIB_CFLAGS=""],
   [-Werror])
-AC_SUBST(PIC_FLAG)
+AC_SUBST(SHLIB_CFLAGS)
 
 case $target_cpu in
   x86_64|amd64)
@@ -363,16 +363,18 @@ AM_CONDITIONAL([IMPLIB_REQUIRED], [test x$implib_required = xyes])
 
 case $host_os in
   darwin*)
-    VHPI_LDFLAGS="-flat_namespace -undefined dynamic_lookup"
+    SHLIB_LDFLAGS="-shared -flat_namespace -undefined dynamic_lookup"
 
     AX_CHECK_LINK_FLAG(
       [-Wl,-no_fixup_chains],
       [AC_DEFINE([HAVE_NO_FIXUP_CHAINS], [1],
                  [Defined if linker supports -no_fixup_chains])
-       AX_APPEND_FLAG([-Wl,-no_fixup_chains], [VHPI_LDFLAGS])])
+       AX_APPEND_FLAG([-Wl,-no_fixup_chains], [SHLIB_LDFLAGS])])
     ;;
+  *)
+    SHLIB_LDFLAGS="-shared"
 esac
-AC_SUBST(VHPI_LDFLAGS)
+AC_SUBST(SHLIB_LDFLAGS)
 
 NVC_CHECK_EMUTLS
 if test "$nvc_cv_use_emutls" = "yes"; then

test/Makemodule.am

@@ -81,7 +81,6 @@ bin_lockbench_LDADD = \
 	lib/libnvc.a \
 	lib/libfastlz.a \
 	lib/libcpustate.a \
-	lib/libcpustate.a \
 	lib/libgnulib.a \
 	$(libdw_LIBS) \
 	$(libffi_LIBS) \
@@ -126,16 +125,17 @@ bin_mtstress_LDADD = \
 	lib/libnvc.a \
 	lib/libfastlz.a \
 	lib/libcpustate.a \
+	lib/libgnulib.a \
 	$(libdw_LIBS) \
 	$(libffi_LIBS) \
 	$(check_LIBS) \
 	$(libzstd_LIBS)
 
 vpi_dump_vpi_SOURCES = test/vpi-dump.c
 
-vpi_dump_vpi_CFLAGS = -fPIC $(AM_LDFLAGS)
+vpi_dump_vpi_CFLAGS = $(SHLIB_CFLAGS) $(AM_LDFLAGS)
 
-vpi_dump_vpi_LDFLAGS = -shared $(AM_LDFLAGS)
+vpi_dump_vpi_LDFLAGS = $(SHLIB_LDFLAGS) $(AM_LDFLAGS)
 
 TESTS_ENVIRONMENT = \
 	BUILD_DIR=$(top_builddir) \

test/vhpi/Makemodule.am

@@ -29,8 +29,8 @@ lib_vhpi_test_so_SOURCES = \
 	test/vhpi/issue1060.c \
 	test/vhpi/issue1161.c
 
-lib_vhpi_test_so_CFLAGS  = $(PIC_FLAG) -I$(top_srcdir)/src/vhpi $(AM_CFLAGS)
-lib_vhpi_test_so_LDFLAGS = -shared $(VHPI_LDFLAGS) $(AM_LDFLAGS)
+lib_vhpi_test_so_CFLAGS  = $(SHLIB_CFLAGS) -I$(top_srcdir)/src/vhpi $(AM_CFLAGS)
+lib_vhpi_test_so_LDFLAGS = $(SHLIB_LDFLAGS) $(AM_LDFLAGS)
 
 if IMPLIB_REQUIRED
 lib_vhpi_test_so_LDADD = lib/libnvcimp.a