Skip to content

Commit 9025a85

Browse files
committed
Update software and get rid of binutils
1 parent 3342b87 commit 9025a85

File tree

3 files changed

+4
-89
lines changed

3 files changed

+4
-89
lines changed

build-linux.sh

+4-59
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,14 @@ WRKDIR="$(pwd)"
1616
ARCHS="aarch64 armv7 i686 x86_64"
1717
GENERIC="generic-w64-mingw32"
1818

19-
# Binutils Settings
20-
BINUTILSDIR="${SRCDIR}/binutils"
21-
BINUTILSTAG="binutils-2_41"
22-
BINUTILSVCS="git://sourceware.org/git/binutils-gdb.git"
23-
2419
# CMake Settings
2520
CMAKEDIR="${SRCDIR}/cmake"
26-
CMAKETAG="v3.27.6"
21+
CMAKETAG="v3.29.3"
2722
CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
2823

2924
# LLVM Settings
3025
LLVMDIR="${SRCDIR}/llvm"
31-
LLVMTAG="llvmorg-18.1.4"
26+
LLVMTAG="llvmorg-18.1.5"
3227
LLVMVCS="https://github.com/llvm/llvm-project.git"
3328

3429
# Make Settings
@@ -45,12 +40,12 @@ MINGWVCS="https://github.com/mirror/mingw-w64.git"
4540

4641
# Ninja Settings
4742
NINJADIR="${SRCDIR}/ninja"
48-
NINJATAG="v1.11.1"
43+
NINJATAG="v1.12.1"
4944
NINJAVCS="https://github.com/ninja-build/ninja.git"
5045

5146
# Wine Settings
5247
WINEDIR="${SRCDIR}/wine"
53-
WINETAG="wine-8.17"
48+
WINETAG="wine-9.8"
5449
WINEVCS="git://source.winehq.org/git/wine.git"
5550

5651

@@ -79,50 +74,6 @@ apply_patches()
7974
fi
8075
}
8176

82-
# This function compiles and installs GNU BINUTILS
83-
binutils_build()
84-
{
85-
echo ">>> Building BINUTILS ..."
86-
for ARCH in ${ARCHS}; do
87-
[ -z ${CLEAN} ] || rm -rf ${BINUTILSDIR}/build-${ARCH}
88-
mkdir -p ${BINUTILSDIR}/build-${ARCH}
89-
cd ${BINUTILSDIR}/build-${ARCH}
90-
case ${ARCH} in
91-
"armv7")
92-
TARGET="arm"
93-
;;
94-
*)
95-
TARGET="${ARCH}"
96-
;;
97-
esac
98-
../configure \
99-
--target=${TARGET}-w64-mingw32 \
100-
--disable-binutils \
101-
--disable-gdb \
102-
--disable-gprof \
103-
--disable-ld \
104-
--disable-multilib \
105-
--disable-nls \
106-
--disable-werror \
107-
--with-zlib=yes
108-
make -j${CORES}
109-
cp ${BINUTILSDIR}/build-${ARCH}/gas/as-new ${BINDIR}/bin/${ARCH}-w64-mingw32-gas
110-
done
111-
cd ${WRKDIR}
112-
}
113-
114-
# This function downloads GNU BINUTILS from VCS
115-
binutils_fetch()
116-
{
117-
if [ ! -d ${BINUTILSDIR} ]; then
118-
echo ">>> Downloading BINUTILS ..."
119-
git clone --depth 1 --branch ${BINUTILSTAG} ${BINUTILSVCS} ${BINUTILSDIR}
120-
cd ${BINUTILSDIR}
121-
apply_patches ${BINUTILSDIR##*/} ${BINUTILSTAG##*-}
122-
cd ${WRKDIR}
123-
fi
124-
}
125-
12677
# This function compiles and installs CMAKE
12778
cmake_build()
12879
{
@@ -575,12 +526,6 @@ mingw_build_libs
575526
# Build and install Mingw-W64 tools
576527
mingw_build_tools
577528

578-
# Download Binutils
579-
binutils_fetch
580-
581-
# Build and install Binutils
582-
binutils_build
583-
584529
# Download Wine
585530
wine_fetch
586531

patches/binutils/2_41/001-add-arm-architectures.patch

-30
This file was deleted.

0 commit comments

Comments
 (0)