Skip to content

Commit 8de366f

Browse files
committed
Revert "Disable x86_64 build for testing"
This reverts commit 522bcb9.
1 parent 7726bf7 commit 8de366f

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

Dockerfile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ RUN set -ex ;\
2626
curl -fL https://ftpmirror.gnu.org/gcc/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz -o gcc.tar.xz ;\
2727
curl -fL https://ftpmirror.gnu.org/gnu/binutils/binutils-$BINUTILS_VERSION.tar.xz -o binutils.tar.xz
2828

29-
# RUN set -ex ;\
30-
# mkdir -p /usr/src/gcc/build ;\
31-
# tar -xf /tmp/gcc.tar.xz -C /usr/src/gcc --strip-components=1 ;\
32-
# cd /usr/src/gcc ;\
33-
# ./contrib/download_prerequisites ;\
34-
# cd build ;\
35-
# ../configure \
36-
# --build=x86_64-linux-gnu \
37-
# --prefix=/opt/x86_64-linux-gnu \
38-
# --with-glibc-version=$GBLIC_VERSION \
39-
# --enable-multilib \
40-
# --enable-languages=c,c++ \
41-
# --with-gcc-major-version-only \
42-
# --disable-nls \
43-
# --disable-bootstrap \
44-
# --enable-default-pie \
45-
# --enable-default-ssp \
46-
# ;\
47-
# make -j$(nproc) ;\
48-
# make install-strip ;\
49-
# update-alternatives --install /usr/bin/gcc gcc /opt/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc 100 ;\
50-
# update-alternatives --install /usr/bin/g++ g++ /opt/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++ 100
29+
RUN set -ex ;\
30+
mkdir -p /usr/src/gcc/build ;\
31+
tar -xf /tmp/gcc.tar.xz -C /usr/src/gcc --strip-components=1 ;\
32+
cd /usr/src/gcc ;\
33+
./contrib/download_prerequisites ;\
34+
cd build ;\
35+
../configure \
36+
--build=x86_64-linux-gnu \
37+
--prefix=/opt/x86_64-linux-gnu \
38+
--with-glibc-version=$GBLIC_VERSION \
39+
--enable-multilib \
40+
--enable-languages=c,c++ \
41+
--with-gcc-major-version-only \
42+
--disable-nls \
43+
--disable-bootstrap \
44+
--enable-default-pie \
45+
--enable-default-ssp \
46+
;\
47+
make -j$(nproc) ;\
48+
make install-strip ;\
49+
update-alternatives --install /usr/bin/gcc gcc /opt/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc 100 ;\
50+
update-alternatives --install /usr/bin/g++ g++ /opt/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++ 100
5151

5252
RUN set -ex ;\
5353
mkdir -p /opt/arm64-sysroot ;\

0 commit comments

Comments
 (0)