From 6be0ae35e8b5bfa46845e12cdd728b131398866b Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 27 Dec 2024 14:25:07 +0900
Subject: [PATCH] Win32: Remove win32 directory if empty

---
 cygwin/GNUmakefile.in | 2 ++
 win32/Makefile.sub    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 7bcf1ada30..8e83d73040 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -99,6 +99,8 @@ yes-test-all:	 export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 yes-test-almost: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 test/% spec/%/ spec/%_spec.rb: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
 
+distclean-local::
+	$(RMDIR) win32
 endif
 
 $(LIBRUBY_SO): $(RUBYDEF)
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 826e4ac10f..0d2b80f676 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1279,6 +1279,7 @@ distclean-local::
 		$(Q)$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
 		-$(Q)$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h verconf.h
 		-$(Q)$(RMDIRS) $(arch_hdrdir:/=\)\ruby
+		-$(Q)$(RMDIR) win32
 
 ext/clean.mk ext/distclean.mk ext/realclean.mk::
 	$(Q)if exist $(EXTS_MK) $(MAKE) -k -f $(EXTS_MK) top_srcdir=$(srcdir) $(*F)