From: Ralf Wildenhues Date: Sun, 15 May 2005 14:12:36 +0000 (+0000) Subject: * m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS, X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22bcc0dc17b5ccd26372e5c4dd5a22eafee8798c;p=thirdparty%2Flibtool.git * m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG) [ linux ]: PGI: Backport whole_archive changes from HEAD. Add $pic_flag to archive_cmds and archive_expsyms_cmds. Bug reported against LAM by Troy Telford . --- diff --git a/ChangeLog b/ChangeLog index ef6ddac60..23f0bacca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-05-15 Ralf Wildenhues + + * m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS, + _LT_LANG_CXX_CONFIG) [ linux ]: PGI: Backport whole_archive changes + from HEAD. Add $pic_flag to archive_cmds and archive_expsyms_cmds. + Bug reported against LAM by Troy Telford . + 2005-05-13 Ralf Wildenhues * THANKS: Updated. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index e3cdce713..10e879d15 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -3134,7 +3134,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - _LT_TAGVAR(whole_archive_flag_spec, $1)='' ;; cxx*) # Compaq C++ @@ -3702,11 +3701,12 @@ _LT_EOF tmp_addflag= case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* ) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_addflag=' -fpic -Mnomain' ;; + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 @@ -5236,12 +5236,12 @@ if test "$_lt_caught_CXX_error" != yes; then ;; pgCC*) # Portland Group C++ compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++