From 9b8ffbb8a0cadd68bf7887c5655a29ec04060111 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Fri, 3 Dec 2021 17:48:18 +0000 Subject: [PATCH] Arrange to --disable-shared by default for VxWorks This change makes sure that shared libraries for VxWorks are only built on explicit request, when configured with --enable-shared. As the support to build shared libs gets in very incrementally, this provides us with a robust way to guard the relevant pieces and reduce the risks of accidentally breaking a platform not yet ready for it. 2022-09-30 Olivier Hainque * configure.ac (*vxworks*): If enable_shared is not set, set to "no" and add --disable-shared to target and host_configargs. * configure: Regenerate. --- configure | 11 +++++++++++ configure.ac | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/configure b/configure index e7604dc6ff0..d9aa84c6138 100755 --- a/configure +++ b/configure @@ -10263,6 +10263,17 @@ case "${target}" in mep*) FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary" ;; + # The VxWorks support for shared libraries is getting in + # incrementally. Make sure it doesn't get activated implicitly: + *vxworks*) + if test "${enable_shared-unset}" = unset ; then + enable_shared=no + # So the build of libraries knows ... + target_configargs="${target_configargs} --disable-shared" + # So gcc knows ... + host_configargs="${host_configargs} --disable-shared" + fi + ;; esac # Makefile fragments. diff --git a/configure.ac b/configure.ac index 3cfd9b41fca..2cff32e300e 100644 --- a/configure.ac +++ b/configure.ac @@ -3440,6 +3440,17 @@ case "${target}" in mep*) FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary" ;; + # The VxWorks support for shared libraries is getting in + # incrementally. Make sure it doesn't get activated implicitly: + *vxworks*) + if test "${enable_shared-unset}" = unset ; then + enable_shared=no + # So the build of libraries knows ... + target_configargs="${target_configargs} --disable-shared" + # So gcc knows ... + host_configargs="${host_configargs} --disable-shared" + fi + ;; esac # Makefile fragments. -- 2.39.2