[Scummvm-git-logs] scummvm master -> 131712474ca0ff03616adebd8c7aab1ef67bd8b4

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
246b803521 BUILD: Avoid duplicating the split dwarf generation rule
131712474c BUILD: Make split-dwarf compatible with llvm-dwp


Commit: 246b8035210a0eef5beeab48763f1b7c434ab0f8
    https://github.com/scummvm/scummvm/commit/246b8035210a0eef5beeab48763f1b7c434ab0f8
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-09-07T12:42:01+02:00

Commit Message:
BUILD: Avoid duplicating the split dwarf generation rule

Changed paths:
    Makefile.common
    rules.mk


diff --git a/Makefile.common b/Makefile.common
index b855ad294fa..fe51630ee1e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -133,8 +133,8 @@ $(EXECUTABLE): $(DETECT_OBJS) $(OBJS)
 	+$(QUIET)$(LS) $@
 
 ifdef SPLIT_DWARF
-$(EXECUTABLE).dwp: $(EXECUTABLE)
-	$(QUIET_DWP)$(DWP) -e $(EXECUTABLE)
+%.dwp: %
+	$(QUIET_DWP)$(DWP) -e $<
 endif
 
 # Grab the ScummVM Manual from Read the Docs
diff --git a/rules.mk b/rules.mk
index b12999377de..96b23cc20f2 100644
--- a/rules.mk
+++ b/rules.mk
@@ -57,9 +57,6 @@ PLUGIN:=
 plugins: $(PLUGIN-$(MODULE))
 
 ifdef SPLIT_DWARF
-$(PLUGIN-$(MODULE)).dwp: $(PLUGIN-$(MODULE))
-	$(QUIET_DWP)$(DWP) -e $<
-
 plugins: $(PLUGIN-$(MODULE)).dwp
 endif
 


Commit: 131712474ca0ff03616adebd8c7aab1ef67bd8b4
    https://github.com/scummvm/scummvm/commit/131712474ca0ff03616adebd8c7aab1ef67bd8b4
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-09-07T12:42:35+02:00

Commit Message:
BUILD: Make split-dwarf compatible with llvm-dwp

We already check in configure that dwp works with -o argument.
LLVM mandates this argument, so provide it.

Changed paths:
    Makefile.common


diff --git a/Makefile.common b/Makefile.common
index fe51630ee1e..7596d13183b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -134,7 +134,7 @@ $(EXECUTABLE): $(DETECT_OBJS) $(OBJS)
 
 ifdef SPLIT_DWARF
 %.dwp: %
-	$(QUIET_DWP)$(DWP) -e $<
+	$(QUIET_DWP)$(DWP) -e $< -o $@
 endif
 
 # Grab the ScummVM Manual from Read the Docs