Skip to content

Commit 40d6823

Browse files
committed
bricks/simhub: Fix debug build paths and mpy-cross.
Then we don't end up with unexpected build files in the MicroPython submodule when debugging.
1 parent bec24ef commit 40d6823

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"name": "simhub",
9797
"type": "cppdbg",
9898
"request": "launch",
99-
"program": "${workspaceFolder}/bricks/simhub/debug/firmware.elf",
99+
"program": "${workspaceFolder}/bricks/simhub/build-debug/firmware.elf",
100100
"stopAtEntry": false,
101101
"cwd": "${workspaceFolder}",
102102
"environment": [

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"label": "build simhub (debug)",
4949
"type": "shell",
50-
"command": "poetry run make DEBUG=1 BUILD=debug COPT=-DPBDRV_CONFIG_CLOCK_LINUX -j",
50+
"command": "make -C ../../micropython/mpy-cross -j && poetry run make DEBUG=1 BUILD=build-debug COPT=-DPBDRV_CONFIG_CLOCK_LINUX -j",
5151
},
5252
{
5353
"label": "build test-pbio",

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ simhub: mpy-cross
8686

8787
clean-simhub: clean-mpy-cross
8888
@$(MAKE) -C bricks/simhub clean
89-
@$(MAKE) -C bricks/simhub clean
90-
@$(MAKE) -C bricks/simhub clean BUILD=debug
91-
89+
@$(MAKE) -C bricks/simhub clean BUILD=build-debug
9290

9391
mpy-cross:
9492
@$(MAKE) -C micropython/mpy-cross CROSS_COMPILE=$(HOST_CROSS_COMPILE)

0 commit comments

Comments
 (0)