Build shared library support by default on platforms that support it

diff --git a/configure.ac b/configure.ac
index c6ce56c..31baed2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -396,36 +396,6 @@ AC_ARG_WITH(ld,
  [FP_PROG_LD()]
 )
 
-dnl ** Build shared and/or static libs?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(shared,
-[AC_HELP_STRING([--enable-shared],
-[Build shared libraries, if available (EXPERIMENTAL, non-working). [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-        AC_MSG_WARN([--enable-shared is experimental and not fully supported at this time])
-        BuildSharedLibs=YES
-  else
-        BuildSharedLibs=NO
-  fi
-],
-[BuildSharedLibs=NO]
-)
-AC_SUBST(BuildSharedLibs)
-
-# ToDo later:
-# AC_ARG_ENABLE(static,
-# [AC_HELP_STRING([--enable-static],
-# [Build static libraries. [default=yes]])],
-# [ if test x"$enableval" = x"yes"; then
-#         BuildStaticLibs=YES
-#   else
-#         BuildStaticLibs=NO
-#   fi
-# ],
-# [BuildStaticLibs=YES]
-# )
-# AC_SUBST(BuildStaticLibs)
-
 dnl ** Booting from .hc files?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hc-boot,

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6c4de5b..5e8e265 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -107,7 +107,12 @@ GhcDebugged=NO
 GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO)
 
 # Build shared and/or static libs?
-BuildSharedLibs=@BuildSharedLibs@
+PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux),YES,NO)
+ifeq "$(PlatformSupportsSharedLibs)" "YES"
+BuildSharedLibs = YES
+else
+BuildSharedLibs = NO
+endif
 # ToDo later:
 # BuildStaticLibs=@BuildStaticLibs@