summaryrefslogtreecommitdiff
path: root/maint.mk
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2010-05-31 17:48:09 +0200
committerSimon Josefsson <simon@josefsson.org>2010-05-31 17:48:09 +0200
commitbde225af952fd3c607c0dab254e0eca8c076c836 (patch)
treed208cc63b52b284ced84523d3913b9efae85ee10 /maint.mk
parentef11b756916c9961d63b373b06ec229841cc07a9 (diff)
downloadgnutls-bde225af952fd3c607c0dab254e0eca8c076c836.tar.gz
Update gnulib files.
Diffstat (limited to 'maint.mk')
-rw-r--r--maint.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/maint.mk b/maint.mk
index 1bdd0d5ff5..e526e0fec6 100644
--- a/maint.mk
+++ b/maint.mk
@@ -689,7 +689,8 @@ define def_sym_regex
perl -lne '$(gl_extract_significant_defines_)' $$f; \
done; \
) | sort -u \
- | sed 's/^/^ *# *define /;s/$$/\\>/'
+ | grep -Ev '^ATTRIBUTE_NORETURN' \
+ | sed 's/^/^ *# *(define|undef) */;s/$$/\\>/'
endef
# Don't define macros that we already get from gnulib header files.
@@ -698,7 +699,7 @@ sc_prohibit_always-defined_macros:
case $$(echo all: | grep -l -f - Makefile) in Makefile);; *) \
echo '$(ME): skipping $@: you lack GNU grep' 1>&2; exit 0;; \
esac; \
- $(def_sym_regex) | grep -f - $$($(VC_LIST_EXCEPT)) \
+ $(def_sym_regex) | grep -E -f - $$($(VC_LIST_EXCEPT)) \
&& { echo '$(ME): define the above via some gnulib .h file' \
1>&2; exit 1; } || :; \
fi