Skip to content

Commit

Permalink
define WIN32_LEAN_AND_MEAN only while compiling gcc
Browse files Browse the repository at this point in the history
fixes: #41
  • Loading branch information
jwt27 committed Jan 27, 2024
1 parent e7135d2 commit 2705fa2
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 5 deletions.
10 changes: 9 additions & 1 deletion build-djgpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,9 @@ if [ ! -z ${GCC_VERSION} ]; then
cd djcross || exit 1

TEMP_CFLAGS="$CFLAGS"
TEMP_CXXFLAGS="$CXXFLAGS"
export CFLAGS="$CFLAGS $GCC_EXTRA_CFLAGS"
export CXXFLAGS="$CXXFLAGS $GCC_EXTRA_CXXFLAGS"

GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}
--enable-languages=${ENABLE_LANGUAGES}"
Expand All @@ -260,7 +262,8 @@ if [ ! -z ${GCC_VERSION} ]; then
echo "Installing gcc (stage 1)"
${SUDO} ${MAKE_J} install-gcc || exit 1

export CFLAGS="$TEMP_CFLAGS"
CFLAGS="$TEMP_CFLAGS"
CXXFLAGS="$TEMP_CXXFLAGS"
fi

if [ ! -z ${DJGPP_VERSION} ]; then
Expand Down Expand Up @@ -313,15 +316,20 @@ if [ ! -z ${GCC_VERSION} ]; then
cd $BUILDDIR/djcross || exit 1

TEMP_CFLAGS="$CFLAGS"
TEMP_CXXFLAGS="$CXXFLAGS"
export CFLAGS="$CFLAGS $GCC_EXTRA_CFLAGS"
export CXXFLAGS="$CXXFLAGS $GCC_EXTRA_CXXFLAGS"

export STAGE_CC_WRAPPER="${BASE}/script/destdir-hack.sh ${DST}/${TARGET}"
${MAKE_J} || exit 1
[ ! -z $MAKE_CHECK_GCC ] && ${MAKE_J} -s check-gcc | tee ${BASE}/tests/gcc.log
echo "Installing gcc (stage 2)"
${SUDO} ${MAKE_J} install-strip || \
${SUDO} ${MAKE_J} install-strip || exit 1
${SUDO} ${MAKE_J} -C mpfr install DESTDIR=${BASE}/build/tmpinst

CFLAGS="$TEMP_CFLAGS"
CXXFLAGS="$TEMP_CXXFLAGS"

set_version gcc
fi
Expand Down
13 changes: 12 additions & 1 deletion script/build-avr-gcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ if [ ! -z ${GCC_VERSION} ]; then
cd gcc-${GCC_VERSION}/build-${TARGET} || exit 1

TEMP_CFLAGS="$CFLAGS"
TEMP_CXXFLAGS="$CXXFLAGS"
export CFLAGS="$CFLAGS $GCC_EXTRA_CFLAGS"
export CXXFLAGS="$CXXFLAGS $GCC_EXTRA_CXXFLAGS"

GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}
--enable-languages=${ENABLE_LANGUAGES}
Expand All @@ -69,7 +71,8 @@ if [ ! -z ${GCC_VERSION} ]; then
echo "Installing gcc (stage 1)"
${SUDO} ${MAKE_J} install-gcc || exit 1

export CFLAGS="$TEMP_CFLAGS"
CFLAGS="$TEMP_CFLAGS"
CXXFLAGS="$TEMP_CXXFLAGS"
fi

cd ${BASE}/build/
Expand Down Expand Up @@ -103,6 +106,11 @@ if [ ! -z ${GCC_VERSION} ]; then
echo "Building gcc (stage 2)"
cd gcc-${GCC_VERSION}/build-${TARGET} || exit 1

TEMP_CFLAGS="$CFLAGS"
TEMP_CXXFLAGS="$CXXFLAGS"
export CFLAGS="$CFLAGS $GCC_EXTRA_CFLAGS"
export CXXFLAGS="$CXXFLAGS $GCC_EXTRA_CXXFLAGS"

export STAGE_CC_WRAPPER="${BASE}/script/destdir-hack.sh ${DST}/${TARGET}"
${MAKE_J} || exit 1
[ ! -z $MAKE_CHECK_GCC ] && ${MAKE_J} -s check-gcc | tee ${BASE}/tests/gcc.log
Expand All @@ -111,5 +119,8 @@ if [ ! -z ${GCC_VERSION} ]; then
${SUDO} ${MAKE_J} install-strip || exit 1
${SUDO} ${MAKE_J} -C mpfr install DESTDIR=${BASE}/build/tmpinst

CFLAGS="$TEMP_CFLAGS"
CXXFLAGS="$TEMP_CXXFLAGS"

set_version gcc
fi
13 changes: 12 additions & 1 deletion script/build-newlib-gcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ if [ ! -z ${GCC_VERSION} ]; then
cd gcc-${GCC_VERSION}/build-${TARGET} || exit 1

TEMP_CFLAGS="$CFLAGS"
TEMP_CXXFLAGS="$CXXFLAGS"
export CFLAGS="$CFLAGS $GCC_EXTRA_CFLAGS"
export CXXFLAGS="$CXXFLAGS $GCC_EXTRA_CXXFLAGS"

GCC_CONFIGURE_OPTIONS+=" --target=${TARGET} --prefix=${PREFIX} ${HOST_FLAG} ${BUILD_FLAG}
--enable-languages=${ENABLE_LANGUAGES}
Expand All @@ -61,7 +63,8 @@ if [ ! -z ${GCC_VERSION} ]; then
echo "Installing gcc (stage 1)"
${SUDO} ${MAKE_J} install-gcc || exit 1

export CFLAGS="$TEMP_CFLAGS"
CFLAGS="$TEMP_CFLAGS"
CXXFLAGS="$TEMP_CXXFLAGS"
fi

cd ${BASE}/build/
Expand Down Expand Up @@ -96,13 +99,21 @@ if [ ! -z ${GCC_VERSION} ]; then
echo "Building gcc (stage 2)"
cd gcc-${GCC_VERSION}/build-${TARGET} || exit 1

TEMP_CFLAGS="$CFLAGS"
TEMP_CXXFLAGS="$CXXFLAGS"
export CFLAGS="$CFLAGS $GCC_EXTRA_CFLAGS"
export CXXFLAGS="$CXXFLAGS $GCC_EXTRA_CXXFLAGS"
export STAGE_CC_WRAPPER="${BASE}/script/destdir-hack.sh ${DST}/${TARGET}"

${MAKE_J} || exit 1
[ ! -z $MAKE_CHECK_GCC ] && ${MAKE_J} -s check-gcc | tee ${BASE}/tests/gcc.log
echo "Installing gcc"
${SUDO} ${MAKE_J} install-strip || \
${SUDO} ${MAKE_J} install-strip || exit 1
${SUDO} ${MAKE_J} -C mpfr install DESTDIR=${BASE}/build/tmpinst

CFLAGS="$TEMP_CFLAGS"
CXXFLAGS="$TEMP_CXXFLAGS"

set_version gcc
fi
4 changes: 2 additions & 2 deletions script/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ MINGW*)
# Make sure MSYS2 Perl is used on mingw-w64 (see issue #27)
export PERL=/usr/bin/perl
# Required to build gcc on recent mingw-w64 (see issue #41)
CFLAGS+=' -DWIN32_LEAN_AND_MEAN'
CXXFLAGS+=' -DWIN32_LEAN_AND_MEAN'
GCC_EXTRA_CFLAGS+=' -DWIN32_LEAN_AND_MEAN'
GCC_EXTRA_CXXFLAGS+=' -DWIN32_LEAN_AND_MEAN'
;;
esac

Expand Down

0 comments on commit 2705fa2

Please sign in to comment.