Skip to content

Commit c96135f

Browse files
committed
Fix ARM_GCC_PATH
As of GCC 14.2.rel1 the top level structure from the windows zip has been removed.
1 parent 90a23f1 commit c96135f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

azure-pipelines-templates/download-install-arm-gcc-toolchain.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ steps:
3030
condition: ne(variables.GCC_CACHE_RESTORED, 'true')
3131
inputs:
3232
archiveFilePatterns: '$(Agent.TempDirectory)\arm-gnu-toolchain-${{ parameters.gccArmVersion }}-mingw-w64-i686-arm-none-eabi.zip'
33-
destinationFolder: "$(Agent.TempDirectory)"
33+
destinationFolder: "$(Agent.TempDirectory)\arm-gnu-toolchain-${{ parameters.gccArmVersion }}-mingw-w64-i686-arm-none-eabi"
3434
cleanDestinationFolder: false
3535

3636
- script: echo "##vso[task.prependpath]$(Agent.TempDirectory)\arm-gnu-toolchain-${{ parameters.gccArmVersion }}-mingw-w64-i686-arm-none-eabi\bin"

install-scripts/install-arm-gcc-toolchain.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ If ($gnuGccPathExists -eq $False -or $force) {
7070

7171
"Installing ARM GNU GCC toolchain..." | Write-Host -ForegroundColor White -NoNewline
7272

73-
# unzip toolchain
74-
Expand-Archive $output -DestinationPath $toolPath > $null
75-
7673
# update tool path to include versioned toolchain folder
7774
$toolPath = $toolPath + "\arm-gnu-toolchain-" + $Version + "-mingw-w64-i686-arm-none-eabi"
7875

76+
# unzip toolchain
77+
Expand-Archive $output -DestinationPath $toolPath > $null
78+
7979
"OK" | Write-Host -ForegroundColor Green
8080
}
8181
}

0 commit comments

Comments
 (0)