From d1ad55c4e08b827b4d38f763e0427096305d460d Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 17 Dec 2020 06:22:43 -0800 Subject: [PATCH] libcody: Allow PIC [PR 98324] While this doesn't fix 98324, it was an omission. Cribbed code from libcpp to build libcody as PIC. libcody/ * configure.ac: Add --enable-host-shared. * Makefile.in: Add FLAGPIC. * configure: Regenerated. --- libcody/Makefile.in | 2 +- libcody/configure | 12 ++++++++++++ libcody/configure.ac | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libcody/Makefile.in b/libcody/Makefile.in index 4b457adc3a4..28ed3a22299 100644 --- a/libcody/Makefile.in +++ b/libcody/Makefile.in @@ -53,7 +53,7 @@ INSTALL := $(srcdir)/build-aux/install-sh # C++ compiler options CXXFLAGS := @CXXFLAGS@ CXXINC := $(filter -I%,@CXX@) -CXXOPTS := $(CXXFLAGS) +CXXOPTS := $(CXXFLAGS) @PICFLAG@ ifeq ($(notdir $(firstword $(CXX))),g++) # It's GCC, or pretending to be it -- so it better smell like it! # Code generation diff --git a/libcody/configure b/libcody/configure index 7699e7a1b2f..b9967a1cd8d 100755 --- a/libcody/configure +++ b/libcody/configure @@ -591,6 +591,7 @@ ALOY DOXYGEN AR EXCEPTIONS +PICFLAG CONFIG_FILES SUBDIRS configure_args @@ -658,6 +659,7 @@ enable_maintainer_mode with_compiler with_bugurl enable_checking +enable_host_shared enable_exceptions ' ac_precious_vars='build_alias @@ -1290,6 +1292,7 @@ Optional Features: only specific categories of checks. Categories are: yes,no,all,none,release. Flags are: misc,valgrind or other strings + --enable-host-shared build host code as shared libraries --enable-exceptions enable exceptions & rtti Optional Packages: @@ -2752,6 +2755,15 @@ else fi +# Enable --enable-host-shared. +# Check whether --enable-host-shared was given. +if test "${enable_host_shared+set}" = set; then : + enableval=$enable_host_shared; PICFLAG=-fPIC +else + PICFLAG= +fi + + # Check whether --enable-exceptions was given. if test "${enable_exceptions+set}" = set; then : diff --git a/libcody/configure.ac b/libcody/configure.ac index 7461dcf4b9c..511fe261b45 100644 --- a/libcody/configure.ac +++ b/libcody/configure.ac @@ -66,6 +66,12 @@ else AC_DEFINE(NMS_CHECKING, 0) fi +# Enable --enable-host-shared. +AC_ARG_ENABLE(host-shared, +[AS_HELP_STRING([--enable-host-shared], + [build host code as shared libraries])], +[PICFLAG=-fPIC], [PICFLAG=]) +AC_SUBST(PICFLAG) NMS_ENABLE_EXCEPTIONS -- 2.30.2