Fix nvcc PIC setting on darwin.

* libltdl/m4/libtool.m4 (_LT_COMPILER_PIC)
<lt_prog_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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 6149a388c8fcd89791dff79d192dabe2d1300e9a..8bc122effd6f122815f364f9b28516e764e337eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix nvcc PIC setting on darwin.
+       * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC)
+       <lt_prog_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 83cee5ef0f00721e5ba9bb0c463db96ec51f43be..0aeca57446a10b3488119fe22680fafb87277f91 100644 (file)
--- 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 e85e21a79183c5aa41a525263ff2d226f894c233..6dd8dd86e432eda4c6e5df61f38181a7f06dc28f 100644 (file)
--- 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 419ffe1d0f4a534c4ce98b57e7eca60ca5390356..1f6114046decd14be19eaef6d292d521c776ef87 100644 (file)
--- 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