Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6465:8fc725193330
Fix portability bug w.r.t. Microsoft's csc compiler.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 02 Dec 2005 13:40:07 +0000 |
| parents | d4112cb80f32 |
| children | 9e0ec6858ac9 |
| files | lib/ChangeLog lib/csharpcomp.c lib/csharpcomp.sh.in |
| diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2005-07-09 Bruno Haible <bruno@clisp.org> + + * csharpcomp.sh.in (options_csc): For -l option, add a .dll suffix. + * csharpcomp.c (compile_csharp_using_sscli): Likewise. + Reported by Mark Junker <mjscod@gmx.de>. + 2005-11-29 Paul Eggert <eggert@cs.ucla.edu> * stdint_.h (intmax_t) [defined intmax_t]: Do not declare.
--- a/lib/csharpcomp.c +++ b/lib/csharpcomp.c @@ -404,9 +404,10 @@ } for (i = 0; i < libraries_count; i++) { - char *option = (char *) xallocsa (11 + strlen (libraries[i]) + 1); + char *option = (char *) xallocsa (11 + strlen (libraries[i]) + 4 + 1); memcpy (option, "-reference:", 11); - strcpy (option + 11, libraries[i]); + memcpy (option + 11, libraries[i], strlen (libraries[i])); + strcpy (option + 11 + strlen (libraries[i]), ".dll"); *argp++ = option; } if (optimize)
--- a/lib/csharpcomp.sh.in +++ b/lib/csharpcomp.sh.in @@ -97,7 +97,7 @@ -l) options_cscc="$options_cscc -l "`echo "$2" | sed -e "$sed_quote_subst"` options_mcs="$options_mcs -r "`echo "$2" | sed -e "$sed_quote_subst"` - options_csc="$options_csc -reference:"`echo "$2" | sed -e "$sed_quote_subst"` + options_csc="$options_csc -reference:"`echo "$2" | sed -e "$sed_quote_subst"`".dll" shift ;; -O)