Changeset 19593

Timestamp:

09/25/15 15:56:27 (10 years ago)

Author:

glperez

Message:

CHG: reverted a small change related to move from CCCL to CL.

File:

• issm/trunk-jpl/externalpackages/autotools/patches/libtool.m4.patch (modified) (3 diffs)

issm/trunk-jpl/externalpackages/autotools/patches/libtool.m4.patch

@@ -1 @@
---- ./externalpackages/autotools/install/share/aclocal/libtool.m4       2015-09-25 12:22:44.498051700 -0700
-+++ /home/daeden/tmp/libtool.m4 2015-09-25 12:24:23.070426400 -0700
+--- ./install/share/aclocal/libtool.m4  2015-09-25 15:51:40.870862200 -0700
++++ /home/daeden/tmp/libtool.m4 2015-09-25 15:42:15.385935100 -0700
 @@ -2382,7 +2382,7 @@
      # Native MSVC
@@ -37 +37 @@
         _LT_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -5130,13 +5130,13 @@
-        # Tell ltmain to make .dll files, not .so files.
-        shrext_cmds=".dll"
-        # FIXME: Setting linknames here is a bad hack.
--       _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+       _LT_TAGVAR(archive_cmds, $1)='$CC /OUT:$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-        _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-            sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+@@ -5136,7 +5136,7 @@
           else
             sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
           fi~
 -         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+         $CC /OUT:$tool_output_objdir$soname $libobjs $compiler_flags $deplibs~
++         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs~
           linknames='
         # The linker will not automatically build a static lib if we build a DLL.
@@ -58 +51 @@
             fi~
 -           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+           $CC /Fo:$tool_output_objdir$soname $libobjs $compiler_flags $deplibs~
++           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs~
             linknames='
           # The linker will not automatically build a static lib if we build a DLL.