diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml index 5fda3cf096a..bd556e56e78 100644 --- a/Meta/Azure/Caches.yml +++ b/Meta/Azure/Caches.yml @@ -26,7 +26,7 @@ steps: - ${{ if eq(parameters.toolchain, 'gcc') }}: - task: Cache@2 inputs: - key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/binutils.patch | Toolchain/Patches/gcc/*.patch | Userland/Libraries/LibC/**/*.h' + key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/binutils/*.patch | Toolchain/Patches/gcc/*.patch | Userland/Libraries/LibC/**/*.h' path: $(Build.SourcesDirectory)/Toolchain/Cache displayName: 'Toolchain Prebuilt Cache' diff --git a/Ports/binutils/patches b/Ports/binutils/patches new file mode 120000 index 00000000000..90c10682065 --- /dev/null +++ b/Ports/binutils/patches @@ -0,0 +1 @@ +../../Toolchain/Patches/binutils \ No newline at end of file diff --git a/Ports/binutils/patches/binutils.patch b/Ports/binutils/patches/binutils.patch deleted file mode 120000 index fbb1ca3b40f..00000000000 --- a/Ports/binutils/patches/binutils.patch +++ /dev/null @@ -1 +0,0 @@ -../../../Toolchain/Patches/binutils.patch \ No newline at end of file diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh index f4f6bde0739..e42255fecb2 100755 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildIt.sh @@ -251,11 +251,13 @@ pushd "$DIR/Tarballs" git init > /dev/null git add . > /dev/null git commit -am "BASE" > /dev/null - git am "$DIR"/Patches/binutils.patch > /dev/null + git am "$DIR"/Patches/binutils/*.patch > /dev/null else - patch -p1 < "$DIR"/Patches/binutils.patch > /dev/null + for patch in "$DIR"/Patches/binutils/*.patch; do + patch -p1 < "$patch" > /dev/null + done fi - $MD5SUM "$DIR"/Patches/binutils.patch > .patch.applied + $MD5SUM "$DIR"/Patches/binutils/*.patch > .patch.applied popd if [ -d ${GCC_NAME} ]; then diff --git a/Toolchain/Patches/binutils.patch b/Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch similarity index 100% rename from Toolchain/Patches/binutils.patch rename to Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch diff --git a/Ports/binutils/patches/ReadMe.md b/Toolchain/Patches/binutils/ReadMe.md similarity index 77% rename from Ports/binutils/patches/ReadMe.md rename to Toolchain/Patches/binutils/ReadMe.md index 1f124cd0807..c82aeed5a6a 100644 --- a/Ports/binutils/patches/ReadMe.md +++ b/Toolchain/Patches/binutils/ReadMe.md @@ -1,6 +1,6 @@ # Patches for binutils on SerenityOS -## `binutils.patch` +## `0001-Add-support-for-SerenityOS.patch` Add support for SerenityOS