patch 9.1.0846: debug symbols for xxd are not cleaned in Makefile
Commit:
https://github.com/vim/vim/commit/d91124f926c85e292b6141191fd98d77cac1e623
Author: Yee Cheng Chin <[email protected]>
Date: Thu Nov 7 22:11:06 2024 +0100
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/Makefile b/src/Makefile
index c7ba9fbf7..7bb0a7ebd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2882,9 +2882,9 @@ uninstall_runtime:
# 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 @@ clean celan: testclean
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 22d1d2616..a1b75862f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 846,
/**/
845,
/**/
diff --git a/src/xxd/Makefile b/src/xxd/Makefile
index d08af7aa0..5937f1374 100644
--- a/src/xxd/Makefile
+++ b/src/xxd/Makefile
@@ -5,3 +5,4 @@ xxd: xxd.c
clean:
rm -f xxd xxd.o
+ rm -rf xxd.dSYM
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1t99qL-004lNo-8p%40256bit.org.
