diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/exported.sh.in | 5 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2019-06-30 Bruno Haible <bruno@clisp.org> + + build: Fix build errors with MSVC. + * lib/exported.sh.in: Remove one level of eval. + * lib/Makefile.am (config.h): Redirect compiler output to stderr. + Remove symbols that contain an '@'. + 2019-05-11 Bruno Haible <bruno@clisp.org> Update bug reporting instructions. diff --git a/lib/Makefile.am b/lib/Makefile.am index 4e8f3f3..640b2cb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -302,8 +302,8 @@ config.h: $(BUILT_SOURCES) $(srcdir)/libunistring.sym ;; \ esac; \ done; \ - } 5>&1 \ - | sed -e 's,.* ,,' | LC_ALL=C sort | LC_ALL=C uniq \ + } 5>&1 1>&2 \ + | sed -e 's,.* ,,' | grep -v '@' | LC_ALL=C sort | LC_ALL=C uniq \ | LC_ALL=C join -v 1 - $(srcdir)/libunistring.sym \ | grep -v '^libintl_locale' \ | sed -e 's,^\(.*\)$$,#define \1 libunistring_\1,' > config.h-t; \ diff --git a/lib/exported.sh.in b/lib/exported.sh.in index 1e5fdc0..be7fb38 100644 --- a/lib/exported.sh.in +++ b/lib/exported.sh.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009, 2019 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,5 +20,4 @@ # This is a separate script because $(GLOBAL_SYMBOL_PIPE) cannot be used in a # Makefile, since it may contain dollar signs. -nm_cmd="@NM@ \"\$1\" | @GLOBAL_SYMBOL_PIPE@" -eval $nm_cmd +@NM@ "$1" | @GLOBAL_SYMBOL_PIPE@ |