From ee570d1229313cb08c3b45421f89d3e37ce34f12 Mon Sep 17 00:00:00 2001 From: Laurynas Biveinis Date: Thu, 22 Mar 2001 18:05:45 +0000 Subject: [PATCH] * ltcf-c.sh: Clear ac_cv_prog_cc_pic for DJGPP. Do not add '-DPIC' to ac_cv_prog_cc_pic for DJGPP. * ltcf-cxx.sh: Likewise. * ltcf-gcj.sh: Likewise. * ltconfig.in: Fix typo. --- ChangeLog | 34 +++++++++++++++++++++------------- ltcf-c.sh | 15 ++++++++++++++- ltcf-cxx.sh | 16 +++++++++++++++- ltcf-gcj.sh | 4 ++++ ltconfig.in | 2 +- 5 files changed, 55 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d637a393..af8c22381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-03-22 Laurynas Biveinis + + * ltcf-c.sh: Clear ac_cv_prog_cc_pic for DJGPP. Do not add + '-DPIC' to ac_cv_prog_cc_pic for DJGPP. + * ltcf-cxx.sh: Likewise. + * ltcf-gcj.sh: Likewise. + * ltconfig.in: Fix typo. + 2001-03-20 Alexandre Oliva * ltmain.in (piecewise linking): Make sure we link at least one @@ -132,14 +140,14 @@ 2001-02-15 Robert Boehne * ltconfig.in: Under AIX 4&5 check to see if we're using - GNU nm, if so, remove -C from the options to $NM. The -C - is required to demangle with AIX nm, but -C means don't - demangle to GNU nm. + GNU nm, if so, remove -C from the options to $NM. The -C + is required to demangle with AIX nm, but -C means don't + demangle to GNU nm. 2001-02-15 Robert Boehne * ltcf-cxx.sh: Only check for broken collect2 under - AIX 4.[012], the check only works on these OS versions. + AIX 4.[012], the check only works on these OS versions. * ltcf-c.sh: Ditto. @@ -147,16 +155,16 @@ 2001-02-12 Robert Boehne - * libtool.m4: Removed the AC_REQUIRE of - AC_PROG_LIBTOOL from AC_LIBTOOL_CXX. - This caused a circular dependency using - CVS autoconf on the tagdemo directory. + * libtool.m4: Removed the AC_REQUIRE of + AC_PROG_LIBTOOL from AC_LIBTOOL_CXX. + This caused a circular dependency using + CVS autoconf on the tagdemo directory. 2001-02-12 Robert Boehne - * libtool.m4: Changed aix4* to aix* to set - deplibs_check_method to pass_all for all aix. - This should have been part of the patch below. + * libtool.m4: Changed aix4* to aix* to set + deplibs_check_method to pass_all for all aix. + This should have been part of the patch below. 2001-02-12 Robert Boehne @@ -173,7 +181,7 @@ 2001-01-31 Robert Boehne - * ltcf-cxx.sh: Eliminated setting LD to $CC + * ltcf-cxx.sh: Eliminated setting LD to $CC 2001-02-05 Gary V. Vaughan @@ -462,7 +470,7 @@ 2000-10-30 Aneesh Kumar K.V * ltcf-c.sh (archive_expsym_cmds): Support for -export-symbol - option on Tru64. + option on Tru64. 2000-10-30 Robert Boehne diff --git a/ltcf-c.sh b/ltcf-c.sh index 3d99a49cc..fda1d8b60 100644 --- a/ltcf-c.sh +++ b/ltcf-c.sh @@ -624,6 +624,10 @@ else lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; + *djgpp*) + # DJGPP does not support shared libraries at all + ac_cv_prog_cc_pic= + ;; cygwin* | mingw* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). @@ -723,7 +727,16 @@ else ;; esac fi - ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC" + case "$host_os" in + # Platforms which do not suport PIC and -DPIC is meaningless + # on them: + *djgpp*) + ac_cv_prog_cc_pic= + ;; + *) + ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC" + ;; + esac fi need_lc=yes diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh index d7cdf6909..c399d34c9 100644 --- a/ltcf-cxx.sh +++ b/ltcf-cxx.sh @@ -663,6 +663,10 @@ if test "$with_gcc" = yes; then lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; + *djgpp*) + # DJGPP does not support shared libraries at all + ac_cv_prog_cc_pic= + ;; cygwin* | mingw* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). @@ -860,7 +864,17 @@ else ;; esac fi -ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC" + +case "$host_os" in + # Platforms which do not suport PIC and -DPIC is meaningless + # on them: + *djgpp*) + ac_cv_prog_cc_pic= + ;; + *) + ac_cv_prog_cc_pic="$ac_cv_prog_cc_pic -DPIC" + ;; +esac # Figure out "hidden" C++ library dependencies from verbose diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh index cce8c22fe..e771276e2 100644 --- a/ltcf-gcj.sh +++ b/ltcf-gcj.sh @@ -604,6 +604,10 @@ fi # we not sure about C++ programs. ac_cv_prog_cc_static="$ac_cv_prog_cc_static ${ac_cv_prog_cc_wl}-lC" ;; + *djgpp*) + # DJGPP does not suppot shared libraries at all + ac_cv_prog_cc_pic= + ;; cygwin* | mingw* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). diff --git a/ltconfig.in b/ltconfig.in index 4d5882be7..8100e579a 100755 --- a/ltconfig.in +++ b/ltconfig.in @@ -1377,7 +1377,7 @@ sysv4) ;; esac -# Handle CRLF in mingw too chain +# Handle CRLF in mingw tool chain opt_cr= case $host_os in mingw*) -- 2.47.2