Skip to content

Commit 769d880

Browse files
committed
Added Dependencies for i686 envs.
1 parent 06776d2 commit 769d880

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/builder_x86_64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
if: success()
125125
- name: install
126126
run: |
127-
sudo apt-get -y install -qq gcc g++ gperf flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget
127+
sudo apt-get -y install -qq gcc g++ gperf gcc-multilib libc6-i386 libc6-dev-i386 flex texinfo pigz gawk gfortran texinfo bison libncurses-dev ccache autoconf automake build-essential libssh2-1-dev openssl libcurl3 unzip wget
128128
sudo /usr/sbin/update-ccache-symlinks
129129
echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
130130
source ~/.bashrc && echo $PATH

build-scripts/CI/x86_64TB

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ echo "Building GCC Desktop GCC $GCC_VERSION Binaries..."
149149
mkdir -p "$BUILDDIR"/pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION
150150
cd "$DOWNLOADDIR"/gcc-"$GCC_VERSION"/build || exit
151151
if [ -n "$(ls -A "$DOWNLOADDIR"/gcc-"$GCC_VERSION"/build)" ]; then rm -rf "$DOWNLOADDIR"/gcc-"$GCC_VERSION"/build/*; fi
152-
../configure CFLAGS="$C_FLAGS" --prefix= --build="$MACHTYPE" --host="$MACHTYPE" --target=$TARGET --enable-languages=$LANGUAGES --with-arch=$ARCH --disable-multilib --program-suffix=-"$GCC_VERSION"
152+
../configure CFLAGS="$C_FLAGS" CXXFLAGS="$C_FLAGS" --prefix= --build="$MACHTYPE" --host="$MACHTYPE" --target=$TARGET --enable-languages=$LANGUAGES --with-arch=$ARCH --disable-multilib --program-suffix=-"$GCC_VERSION"
153153
make -s -j$(nproc)
154154
make -s install-strip DESTDIR="$BUILDDIR"/pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION
155155
if [ -n "$(ls -A "$DOWNLOADDIR"/gcc-"$GCC_VERSION"/build)" ]; then rm -rf "$DOWNLOADDIR"/gcc-"$GCC_VERSION"/build/*; fi
@@ -159,7 +159,7 @@ cat gcc/limitx.h gcc/glimits.h gcc/limity.h > "$BUILDDIR"/pi-gcc-"$GCC_VERSION"-
159159
echo "Building Desktop GDB Binaries..."
160160
cd "$DOWNLOADDIR"/gdb-$GDB_VERSION/build || exit
161161
if [ -n "$(ls -A "$DOWNLOADDIR"/gdb-$GDB_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/gdb-$GDB_VERSION/build/*; fi
162-
../configure CFLAGS="$C_FLAGS" --prefix= --build="$MACHTYPE" --host="$MACHTYPE" --target=$TARGET --with-arch=$ARCH --program-suffix=-"$GCC_VERSION"
162+
../configure CFLAGS="$C_FLAGS" CXXFLAGS="$C_FLAGS" --prefix= --build="$MACHTYPE" --host="$MACHTYPE" --target=$TARGET --with-arch=$ARCH --program-suffix=-"$GCC_VERSION"
163163
make -s -j$(nproc)
164164
make -s install DESTDIR="$BUILDDIR"/pi-gcc-"$GCC_VERSION"-$FOLDER_VERSION
165165
if [ -n "$(ls -A "$DOWNLOADDIR"/gdb-$GDB_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/gdb-$GDB_VERSION/build/*; fi

0 commit comments

Comments
 (0)