[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1226-gd21d944

[darcagn <da...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  d21d9443bddf8bc311b5f3d755bdc083ab31ec8e (commit)
      from  e52b269ed800f2bcc18271c27a54bcd7c1a3a76f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d21d9443bddf8bc311b5f3d755bdc083ab31ec8e
Author: Colton Pawielski <cep...@us...>
Date:   Sun Dec 24 11:57:09 2023 -0600

    Properly clean dc-chain builds from SH4 Pass1 & GDB (#433)
    
    * Fix Clean of dc-chain Pass1
    
    Due to splitting Pass 1 & 2 build folders, both
    ARM & SH4 Pass 1 folders need to be removed if
    clean=1 is specified in the configuration. This allows
    the removal of a "hack" for removing the ARM Pass 1
    build folder.
    
    * Clean GDB build folder if clean=1

-----------------------------------------------------------------------

Summary of changes:
 utils/dc-chain/scripts/build.mk     |  1 -
 utils/dc-chain/scripts/gcc-pass1.mk |  1 +
 utils/dc-chain/scripts/gdb.mk       | 15 +++++++++------
 utils/dc-chain/scripts/options.mk   |  5 -----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/utils/dc-chain/scripts/build.mk b/utils/dc-chain/scripts/build.mk
index ec3ed2b..e183ebb 100644
--- a/utils/dc-chain/scripts/build.mk
+++ b/utils/dc-chain/scripts/build.mk
@@ -10,7 +10,6 @@ build-sh4: build-sh4-gcc
 build-arm: build-arm-gcc
 build-sh4-gcc: build-sh4-gcc-pass2
 build-arm-gcc: build-arm-gcc-pass1
-	$(clean_arm_hack)
 build-sh4-newlib: build-sh4-newlib-only fixup-sh4-newlib
 
 fixup_sh4_newlib_stamp = fixup-sh4-newlib.stamp
diff --git a/utils/dc-chain/scripts/gcc-pass1.mk b/utils/dc-chain/scripts/gcc-pass1.mk
index ab4c0cb..20c71c5 100644
--- a/utils/dc-chain/scripts/gcc-pass1.mk
+++ b/utils/dc-chain/scripts/gcc-pass1.mk
@@ -30,3 +30,4 @@ $(build_gcc_pass1): logdir
 	      $(to_log)
 	$(MAKE) $(makejobs) -C $(build) DESTDIR=$(DESTDIR) $(to_log)
 	$(MAKE) -C $(build) $(install_mode) DESTDIR=$(DESTDIR) $(to_log)
+	$(clean_up)
diff --git a/utils/dc-chain/scripts/gdb.mk b/utils/dc-chain/scripts/gdb.mk
index 610feea..42c72fa 100644
--- a/utils/dc-chain/scripts/gdb.mk
+++ b/utils/dc-chain/scripts/gdb.mk
@@ -43,9 +43,9 @@ $(stamp_gdb_build): patch_gdb
 	@echo "+++ Building GDB..."
 	rm -f $@
 	> $(log)
-	-rm -rf build-$(gdb_name)
-	mkdir build-$(gdb_name)
-	cd build-$(gdb_name); \
+	-rm -rf $(build)
+	mkdir $(build)
+	cd $(build); \
         ../$(gdb_name)/configure \
           --disable-werror \
           --prefix=$(sh_prefix) \
@@ -55,7 +55,7 @@ $(stamp_gdb_build): patch_gdb
           $(macos_gdb_configure_args) \
           $(static_flag) \
           $(to_log)
-	$(MAKE) $(makejobs) -C build-$(gdb_name) $(to_log)
+	$(MAKE) $(makejobs) -C $(build) $(to_log)
 	touch $@
 
 # This step runs post install to sign the sh-elf-gdb binary on MacOS
@@ -77,17 +77,20 @@ install_gdb: $(GDB_INSTALL_TARGET)
 # The 'install-strip' mode support is partial in GDB so there is a little hack
 # below to remove useless debug symbols
 # See: https://sourceware.org/legacy-ml/gdb-patches/2012-01/msg00335.html
+
 $(stamp_gdb_install): build_gdb
 	@echo "+++ Installing GDB..."
 	rm -f $@
-	$(MAKE) -C build-$(gdb_name) install DESTDIR=$(DESTDIR) $(to_log)
+	$(MAKE) -C $(build) install DESTDIR=$(DESTDIR) $(to_log)
 	@if test "$(install_mode)" = "install-strip"; then \
-		$(MAKE) -C build-$(gdb_name)/gdb $(install_mode) DESTDIR=$(DESTDIR) $(to_log); \
+		$(MAKE) -C $(build)/gdb $(install_mode) DESTDIR=$(DESTDIR) $(to_log); \
 		gdb_run=$(sh_prefix)/bin/$(sh_target)-run$(executable_extension); \
 		if test -f $${gdb_run}; then \
 			strip $${gdb_run}; \
 		fi; \
 	fi;
 	touch $@
+	$(clean_up)
 
+gdb: build = build-$(gdb_name)
 gdb: install_gdb
diff --git a/utils/dc-chain/scripts/options.mk b/utils/dc-chain/scripts/options.mk
index 986bc57..6f85049 100644
--- a/utils/dc-chain/scripts/options.mk
+++ b/utils/dc-chain/scripts/options.mk
@@ -11,11 +11,6 @@ ifeq (1,$(erase))
     @echo "+++ Cleaning up $(build)..."
     -rm -rf $(build)
   endef
-  # Hack to clean up ARM gcc pass 1
-  define clean_arm_hack
-    @echo "+++ Cleaning up build-gcc-$(arm_target)-$(gcc_ver)..."
-    -rm -rf build-gcc-$(arm_target)-$(gcc_ver)
-  endef
 endif
 
 # If verbose=1, display output to screen as well as log files


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.