Skip to content

Commit a563578

Browse files
committed
build-binutils.py: 2.46
Unfortunately, the current folder_name logic does not work for the 2.46 tarballs due to the .0 patch version, which was a mistake. Link: https://inbox.sourceware.org/binutils/87fr7bo3zi.fsf@redhat.com/ Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent c7267d1 commit a563578

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

build-binutils.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import tc_build.binutils
99
import tc_build.utils
1010

11-
LATEST_BINUTILS_RELEASE = (2, 45, 0)
11+
LATEST_BINUTILS_RELEASE = (2, 46, 0)
1212

1313
parser = ArgumentParser()
1414
parser.add_argument('-B',
@@ -78,7 +78,10 @@
7878
raise RuntimeError(f"Provided binutils source ('{bsm.location}') does not exist?")
7979
else:
8080
# Turns (2, 40, 0) into 2.40 and (2, 40, 1) into 2.40.1 to follow tarball names
81-
folder_name = 'binutils-' + '.'.join(str(x) for x in LATEST_BINUTILS_RELEASE if x)
81+
# folder_name = 'binutils-' + '.'.join(str(x) for x in LATEST_BINUTILS_RELEASE if x)
82+
# This logic does not hold for the 2.46 tarball unfortunately:
83+
# https://inbox.sourceware.org/binutils/b30e780b-abc4-437b-bdcf-bb743a1c9eea@redhat.com/
84+
folder_name = 'binutils-' + '.'.join(map(str, LATEST_BINUTILS_RELEASE))
8285

8386
bsm.location = Path(tc_build_folder, 'src', folder_name)
8487
bsm.tarball.base_download_url = 'https://sourceware.org/pub/binutils/releases'

0 commit comments

Comments
 (0)