Skip to content

Commit 29726cf

Browse files
committed
Fix toolchain helper files placement
Signed-off-by: paulober <[email protected]>
1 parent da76b20 commit 29726cf

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/utils/download.mts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -508,15 +508,14 @@ export async function downloadAndInstallSDK(
508508
);
509509
// Constants taken from the SDK CMakeLists.txt files
510510
const TINYUSB_TEST_PATH = joinPosix(
511-
"lib/tinyusb", "src/portable/raspberrypi/rp2040"
511+
"lib/tinyusb",
512+
"src/portable/raspberrypi/rp2040"
512513
);
513514
const CYW43_DRIVER_TEST_FILE = joinPosix("lib/cyw43-driver", "src/cyw43.h");
514515
const LWIP_TEST_PATH = joinPosix("lib/lwip", "src/Filelists.cmake");
515516
const BTSTACK_TEST_PATH = joinPosix("lib/btstack", "src/bluetooth.h");
516-
const MBEDTLS_TEST_PATH = joinPosix("lib/mbedtls", "library/aes.c")
517-
const submoduleChecks = [
518-
TINYUSB_TEST_PATH
519-
]
517+
const MBEDTLS_TEST_PATH = joinPosix("lib/mbedtls", "library/aes.c");
518+
const submoduleChecks = [TINYUSB_TEST_PATH];
520519
if (compareGe(version, "1.4.0")) {
521520
submoduleChecks.push(CYW43_DRIVER_TEST_FILE);
522521
submoduleChecks.push(LWIP_TEST_PATH);
@@ -968,12 +967,12 @@ export async function downloadAndInstallToolchain(
968967
// includes helper stuff for swift code - pico-sdk c interop
969968
copyFileSync(
970969
joinPosix(getScriptsRoot(), "bridge.h"),
971-
joinPosix(buildCMakeIncPath(true), "bridge.h")
970+
joinPosix(buildBasicToolchainPath(true), "bridge.h")
972971
);
973972
// includes helper stuff for the swift compiler (workaround)
974973
copyFileSync(
975974
joinPosix(getScriptsRoot(), "bridge.c"),
976-
joinPosix(buildCMakeIncPath(true), "bridge.c")
975+
joinPosix(buildBasicToolchainPath(true), "bridge.c")
977976
);
978977

979978
const archiveFileName = `${toolchain.version}.${artifactExt}`;

0 commit comments

Comments
 (0)