diff options
| author | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-05-30 19:46:03 +0300 |
|---|---|---|
| committer | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-05-30 19:46:03 +0300 |
| commit | 9c4a5d64ca8e4310fd81de22bbf141c2a1d62b36 (patch) | |
| tree | a2d684d591b860976dd01226d7841eeb16030d80 /Makefile.am | |
| parent | 347981ca5533b540f187ae3d09495a8e344c4de1 (diff) | |
| parent | 437dde701c13e707e5fd912ef6403e09052e4d9b (diff) | |
| download | riscv-openocd-9c4a5d64ca8e4310fd81de22bbf141c2a1d62b36.zip riscv-openocd-9c4a5d64ca8e4310fd81de22bbf141c2a1d62b36.tar.gz riscv-openocd-9c4a5d64ca8e4310fd81de22bbf141c2a1d62b36.tar.bz2 | |
Merge up to 437dde701c13e707e5fd912ef6403e09052e4d9b from upstream
Conflict in src/rtos/FreeRTOS.c due to
fbea7d5d38d0dcbdd71cb574da9bd12c78b568cf -- resolved by replacing
`target->type->name` with a call to `target_type_name()`.
Change-Id: I56702c6133894458903de7a4d764903004aa8b86
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 1e3e097..f9e0d6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,9 +116,14 @@ TCL_PATH = tcl TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' -o -name '*.txt' | \ sed -e 's,^$(srcdir)/$(TCL_PATH),,' +# Without the PERL_UNICODE="IO" workaround below when running git2cl, you get several +# "Wide character" warnings and you also risk an invalid character encoding in +# the generated ChangeLog file. For more information, see this bug report: +# Warning "Wide character in print" +# https://savannah.nongnu.org/bugs/?65689 dist-hook: if test -d $(srcdir)/.git -a \( ! -e $(distdir)/ChangeLog -o -w $(distdir)/ChangeLog \) ; then \ - git --git-dir $(srcdir)/.git log | $(srcdir)/tools/git2cl/git2cl > $(distdir)/ChangeLog ; \ + git --git-dir $(srcdir)/.git log | PERL_UNICODE="IO" $(srcdir)/tools/git2cl/git2cl > $(distdir)/ChangeLog ; \ fi for i in $$($(TCL_FILES)); do \ j="$(distdir)/$(TCL_PATH)/$$i" && \ |