patch 9.1.0846: debug symbols for xxd are not cleaned in Makefile
Problem: debug symbols for xxd are not cleaned in Makefile
Solution: remove xxd.dSYM in xxds Makefile, call xxd clean target from
main Makefile (Yee Cheng Chin)
Remove xxd.dSYM folder when calling `make clean`. On macOS, when
compiling with debug info, clang will generate a "dSYM" folder that
contains debug symbols for the executable because unlike Linux, the
DWARF data is not embedded in the executable itself.
closes: #16010
Signed-off-by: Yee Cheng Chin <ychin.git@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/Makefile b/src/Makefile
index c7ba9fb..7bb0a7e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2882,9 +2882,9 @@
# Clean up all the files that have been produced, except configure's.
# We support common typing mistakes for Juergen! :-)
clean celan: testclean
- -rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
+ -rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim
-rm -rf objects
- -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h auto/os_haiku.rdef
+ -rm -f auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h auto/os_haiku.rdef
-rm -f conftest* *~ auto/link.sed
-rm -f testdir/opt_test.vim
-rm -f $(UNITTEST_TARGETS)
@@ -2894,6 +2894,7 @@
if test -d $(PODIR); then \
cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \
fi
+ cd xxd; $(MAKE) clean
# Make a shadow directory for compilation on another system or with different
# features:
diff --git a/src/version.c b/src/version.c
index 22d1d26..a1b7586 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 846,
+/**/
845,
/**/
844,
diff --git a/src/xxd/Makefile b/src/xxd/Makefile
index d08af7a..5937f13 100644
--- a/src/xxd/Makefile
+++ b/src/xxd/Makefile
@@ -5,3 +5,4 @@
clean:
rm -f xxd xxd.o
+ rm -rf xxd.dSYM