Skip to content

Commit ed40810

Browse files
committed
Remove cherry-picks
1 parent 4ea5d0d commit ed40810

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

packages/windows/picotool/build-picotool.sh

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

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

1814
echo "Version is $sdkVersion"
@@ -58,14 +54,6 @@ fi
5854

5955
cd picotool
6056

61-
# Apply https://github.com/raspberrypi/picotool/commit/f010190c37061f9a207075c6918a5e6e9aee5653 for CMake 4.x
62-
git fetch origin f010190c37061f9a207075c6918a5e6e9aee5653
63-
git cherry-pick -n f010190c37061f9a207075c6918a5e6e9aee5653
64-
65-
# Apply https://github.com/raspberrypi/picotool/commit/ac8aaeac7e7c2dfb55a277c5aa4ff6537612789d for GCC 15
66-
git fetch origin ac8aaeac7e7c2dfb55a277c5aa4ff6537612789d
67-
git cherry-pick -n ac8aaeac7e7c2dfb55a277c5aa4ff6537612789d
68-
6957
mkdir -p build
7058
cd build
7159
cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Release -DPICOTOOL_FLAT_INSTALL=1

0 commit comments

Comments
 (0)