Skip to content

Commit 0be64c9

Browse files
committed
Fix cherry pick?
1 parent eb35cf8 commit 0be64c9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

packages/windows/picotool/build-picotool.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ sdkVersion=$1
99
export PICO_SDK_PATH="$PWD/pico-sdk"
1010
export LDFLAGS="-static -static-libgcc -static-libstdc++"
1111

12-
git -C "$PICO_SDK_PATH" submodule update --init --depth=1 lib/mbedtls
13-
1412
# Apply https://github.com/raspberrypi/pico-sdk/commit/66540fe88e86a9f324422b7451a3b5dff4c0449f for gcc 15
1513
git -C "$PICO_SDK_PATH" fetch origin 66540fe88e86a9f324422b7451a3b5dff4c0449f
16-
git -C "$PICO_SDK_PATH" cherry-pick 66540fe88e86a9f324422b7451a3b5dff4c0449f
14+
git -C "$PICO_SDK_PATH" cherry-pick -n 66540fe88e86a9f324422b7451a3b5dff4c0449f
15+
16+
git -C "$PICO_SDK_PATH" submodule update --init --depth=1 lib/mbedtls
1717

1818
echo "Version is $sdkVersion"
1919
if [ ${sdkVersion:0:1} -ge 2 ]; then

0 commit comments

Comments
 (0)