From: Ralf Wildenhues Date: Mon, 6 Dec 2010 03:31:14 +0000 (+0100) Subject: Fix nvcc PIC setting on darwin. X-Git-Tag: v2.4.2~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82beb2a169ac1943df67be90675c3135ece03735;p=thirdparty%2Flibtool.git Fix nvcc PIC setting on darwin. * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) : Prepend -Xcompiler to nonempty variable setting rather than hard-coding -Xcompiler -fPIC, for darwin. * NEWS, THANKS: Update. Report by Paweł Daniluk. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 6149a388c..8bc122eff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-12-10 Ralf Wildenhues + Fix nvcc PIC setting on darwin. + * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) + : Prepend -Xcompiler to nonempty variable + setting rather than hard-coding -Xcompiler -fPIC, for darwin. + * NEWS, THANKS: Update. + Report by Paweł Daniluk. + Honor $AUTOCONF, $AUTOMAKE in --help output. * libltdl/config/getopt.m4sh (func_help): Use $AUTOCONF and $AUTOMAKE if set, for --version outout. diff --git a/NEWS b/NEWS index 83cee5ef0..0aeca5744 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,7 @@ New in 2.4.2 2010-12-??: git version 2.4.1a, Libtool team: not available) works again. Regression introduced in v2.2.6-39-g9c3d4d8. - The bug that leaked developer tool paths into the release tarballs from ./bootstrap is fixed. + - Improved support for the Cuda Compiler Driver (nvcc) on Darwin. * Important incompatible changes: diff --git a/THANKS b/THANKS index e85e21a79..6dd8dd86e 100644 --- a/THANKS +++ b/THANKS @@ -147,6 +147,7 @@ Paul Biggar paul.biggar@gmail.com Paul Eggert eggert@twinsun.com Paul Laight plaight@quantxautomation.co.uk + Paweł Daniluk pawel@bioexploratorium.pl Peter Eisentraut peter_e@gmx.net Peter Fritzsche peter.fritzsche@gmx.de Peter Jeremy peterjeremy@optushome.com.au diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 419ffe1d0..1f6114046 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -4232,7 +4232,9 @@ m4_if([$1], [CXX], [ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else