From 4e77e8f1599742192e42c3b8d38ddc3c175caa0f Mon Sep 17 00:00:00 2001 From: Manfred Hollstein Date: Fri, 6 Feb 1998 00:33:04 +0000 Subject: [PATCH] Makefile.in (BASE_FLAGS_TO_PASS): Don't pass PICFLAG and PICFLAG_FOR_TARGET. * Makefile.in (BASE_FLAGS_TO_PASS): Don't pass PICFLAG and PICFLAG_FOR_TARGET. (EXTRA_TARGET_FLAGS): Don't pass PICFLAG_FOR_TARGET. * configure: Emit a definition for the new macro enable_shared into each Makefile. * config/mh-sparcpic (PICFLAG): Define to properly according to current multilib configuration. * config/mt-sparcpic (PICFLAG_FOR_TARGET): Define to properly according to current multilib configuration. From-SVN: r17680 --- ChangeLog | 14 ++++++++++++++ config/mh-sparcpic | 2 +- config/mt-sparcpic | 2 +- configure | 7 +++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 491a5263ac8..e157714c635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Fri Feb 6 01:33:52 1998 Manfred Hollstein + + * Makefile.in (BASE_FLAGS_TO_PASS): Don't pass PICFLAG and + PICFLAG_FOR_TARGET. + (EXTRA_TARGET_FLAGS): Don't pass PICFLAG_FOR_TARGET. + + * configure: Emit a definition for the new macro enable_shared + into each Makefile. + + * config/mh-sparcpic (PICFLAG): Define to properly according + to current multilib configuration. + * config/mt-sparcpic (PICFLAG_FOR_TARGET): Define to properly + according to current multilib configuration. + Sun Feb 1 02:40:41 1998 Richard Henderson * Makefile.in (TARGET_CONFIGDIRS): Add libf2c. diff --git a/config/mh-sparcpic b/config/mh-sparcpic index 35cf2c8ee4e..f6dbc22e3ca 100644 --- a/config/mh-sparcpic +++ b/config/mh-sparcpic @@ -1 +1 @@ -PICFLAG=-fPIC +PICFLAG=`case "${LIBCFLAGS} ${LIBCXXFLAGS}" in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac` diff --git a/config/mt-sparcpic b/config/mt-sparcpic index 35b8c9e4dc2..fd0ec271afc 100644 --- a/config/mt-sparcpic +++ b/config/mt-sparcpic @@ -1 +1 @@ -PICFLAG_FOR_TARGET=-fPIC +PICFLAG_FOR_TARGET=`case "${LIBCFLAGS} ${LIBCXXFLAGS}" in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac` diff --git a/configure b/configure index c821cf6091d..5421fa753f1 100755 --- a/configure +++ b/configure @@ -1195,6 +1195,13 @@ EOF echo gxx_include_dir = ${with_gxx_include_dir} >> ${Makefile} fi + # record if we want to build shared libs. + if test -z "${enable_shared}"; then + echo enable_shared = no >> ${Makefile} + else + echo enable_shared = ${enable_shared} >> ${Makefile} + fi + # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, # remove any form feeds. if [ -z "${subdirs}" ]; then