Skip to content

Commit dea9eb2

Browse files
committed
quick test
1 parent f8d6b91 commit dea9eb2

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

build-djgpp.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ if [ ! -z ${GCC_VERSION} ]; then
229229
GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX}
230230
--enable-languages=${ENABLE_LANGUAGES}
231231
${HOST_FLAG} ${BUILD_FLAG} ${WITH_LIBS}
232-
--with-native-system-header-dir=${PREFIX}/${TARGET}/sys-include"
232+
--with-native-system-header-dir=${PREFIX}/${TARGET}/sys-include
233+
--with-system-zlib"
233234

234235
if [ ! -z "${DESTDIR}" ]; then
235236
GCC_CONFIGURE_OPTIONS+=" --with-build-sysroot=${DESTDIR}"

script/build-avr-gcc.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ if [ ! -z ${GCC_VERSION} ]; then
4040

4141
GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}
4242
--enable-languages=${ENABLE_LANGUAGES}
43-
--with-avrlibc ${WITH_LIBS}"
43+
--with-avrlibc ${WITH_LIBS}
44+
--with-system-zlib"
4445
strip_whitespace GCC_CONFIGURE_OPTIONS
4546

4647
if [ ! -e configure-prefix ] || [ ! "`cat configure-prefix`" == "${GCC_CONFIGURE_OPTIONS}" ]; then

script/build-binutils.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ cd build-${TARGET} || exit 1
33

44
echo "Building binutils"
55

6-
BINUTILS_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}"
6+
BINUTILS_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX}
7+
${HOST_FLAG} ${BUILD_FLAG}
8+
--with-system-zlib"
79
strip_whitespace BINUTILS_CONFIGURE_OPTIONS
810

911
if [ ! -e configure-prefix ] || [ ! "`cat configure-prefix`" = "${BINUTILS_CONFIGURE_OPTIONS}" ]; then

script/build-gdb.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ if [ ! -z ${GDB_VERSION} ]; then
1515

1616
echo "Building gdb"
1717

18-
GDB_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG} ${WITH_LIBS}"
18+
GDB_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX}
19+
${HOST_FLAG} ${BUILD_FLAG} ${WITH_LIBS}
20+
--with-system-zlib"
1921
strip_whitespace GDB_CONFIGURE_OPTIONS
2022

2123
if [ ! -e configure-prefix ] || [ ! "`cat configure-prefix`" = "${GDB_CONFIGURE_OPTIONS}" ]; then

script/build-newlib-gcc.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ if [ ! -z ${GCC_VERSION} ]; then
3232

3333
GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}
3434
--enable-languages=${ENABLE_LANGUAGES}
35-
--with-newlib ${WITH_LIBS}"
35+
--with-newlib ${WITH_LIBS}
36+
--with-system-zlib"
3637
strip_whitespace GCC_CONFIGURE_OPTIONS
3738

3839
if [ ! -e configure-prefix ] || [ ! "`cat configure-prefix`" == "${GCC_CONFIGURE_OPTIONS}" ]; then
@@ -60,7 +61,9 @@ if [ ! -z ${NEWLIB_VERSION} ]; then
6061
mkdir -p newlib-${NEWLIB_VERSION}/build-${TARGET}
6162
cd newlib-${NEWLIB_VERSION}/build-${TARGET} || exit 1
6263

63-
NEWLIB_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}"
64+
NEWLIB_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX}
65+
${HOST_FLAG} ${BUILD_FLAG}
66+
--with-system-zlib"
6467
strip_whitespace NEWLIB_CONFIGURE_OPTIONS
6568

6669
if [ ! -z ${GCC_VERSION} ] || [ ! "`cat configure-options 2> /dev/null`" == "${NEWLIB_CONFIGURE_OPTIONS}" ]; then

0 commit comments

Comments
 (0)