#d54bc0c Fix gdbcmd file generation

Author: fred322

_charm/src/d54bc0c8c8e3e90dc7a4e887cbf8f55f59715f89761368b868730c3ac06ec7e5.cr

@@ -7,5 +7,5 @@
 <links>
 <link name="parent">7bc74cc796c455a46d699ad91f6aca5b7c790f56a6a0968b4ecbce33efce9d25</link>
 </links>
-<cf v="sdevaux 2025-02-17T22:26:18+01:00"/>
+<cf v="fred322 2025-04-18T11:02:26+02:00"/>
 </cr>

core/module-crules.mk

@@ -241,22 +241,23 @@ run:: all
       || $(ABS_PRINT_error) "Run failed: $(TARGETFILE_EXE) $(RUNARGS)"
 	@$(RUNTIME_EPILOG)
 
-GDBCMD:=$(BUILDROOT)/gdb-$(MODNAME)
+GDBCMD:=$(OBJDIR)/gdb-$(MODNAME)
 
-.PHONY: debugcmd
-gdbcmd: $(TARGETFILE_EXE)
+.PHONY: $(GDBCMD)
+$(GDBCMD): $(TARGETFILE_EXE)
 	@$(ABS_PRINT_info) "Generating gdb test script $(GDBCMD)"
-	@mkdir -p $(BUILDROOT)
-	@echo 'set environment LD_LIBRARY_PATH=$(TLDLIBP)' > $(GDBCMD)
+	@mkdir -p $(@D)
+	@echo 'set environment LD_LIBRARY_PATH=$(LDLIBP)' > $(GDBCMD)
+	@echo 'set environment WINEPATH="$(WINEFULLPATH);$$WINEPATH"' >> $(GDBCMD)
 	@echo 'set args $(RUNARGS)' >> $(GDBCMD)
 	@echo 'file $(TARGETFILE_EXE)' >> $(GDBCMD)
 	@printf "define runapp\nrun\nend\n" >> $(GDBCMD)
 
 
 # run application with gdb
 # TODO cygwin compat
-debug:: $(TARGETFILE_EXE) gdbcmd
-	@PATH=$(RUNPATH) $(RUNTIME_ENV) gdb -x $(GDBCMD)
+debug:: $(GDBCMD)
+	@PATH=$(RUNPATH) $(RUNTIME_ENV) gdb -x $<
 
 # print eclipse setup
 .PHONY:	edebug

core/module-test.mk

@@ -254,13 +254,12 @@ endif
 ##  - debugcheck [RUNARGS="<arg> [<arg>]*": run test from gdb debugger
 # TODO add cygwin support
 
-GDBCMDTEST:=$(BUILDROOT)/gdb-$(MODNAME).test
+GDBCMDTEST:=$(OBJDIR)/gdb-$(MODNAME).test
 
-
-.PHONY: gdbcmdtest
-gdbcmdtest: testbuild
+.PHONY: $(GDBCMDTEST)
+$(GDBCMDTEST): testbuild
 	@$(ABS_PRINT_info) "Generating gdb test script $(GDBCMDTEST)"
-	@mkdir -p $(BUILDROOT)
+	@mkdir -p $(@D)
 	@echo 'set environment LD_LIBRARY_PATH=$(TLDLIBP)' > $(GDBCMDTEST)
 	@echo 'set environment TRDIR=$(TRDIR)' >> $(GDBCMDTEST)
 	@echo 'set environment TTARGETDIR=$(TTARGETDIR)' >> $(GDBCMDTEST)
@@ -270,9 +269,9 @@ gdbcmdtest: testbuild
 
 
 .PHONY: debugcheck
-debugcheck: testbuild gdbcmdtest
+debugcheck: $(GDBCMDTEST)
 	@$(ABS_PRINT) "use" "Use runtests command to launch tests from gdb"
-	@PATH="$(RUNPATH)" gdb  -x $(GDBCMDTEST)
+	@PATH="$(RUNPATH)" gdb -x $<
 
 GDBSERVER_PORT?=9091
 ##  - remotedebugtest [RUNARGS="<arg> [<arg>]*": run test from gdbserver debugger] [GDBSERVER_PORT=9091 : default gdbserver port]