From c0fb1e05b5286b911a727d27f74d480e1f304bbb Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 14 Nov 2007 20:54:20 +0000 Subject: [PATCH] 2007-11-14 21:53 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/make_xmingwce.sh * updated for different then GCC host C compiler name (DJGPP in DOS and MINGW32 in MS-Windows) --- harbour/ChangeLog | 5 +++++ harbour/make_xmingwce.sh | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0e16ee22ce..36726e8ee6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-14 21:53 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/make_xmingwce.sh + * updated for different then GCC host C compiler name + (DJGPP in DOS and MINGW32 in MS-Windows) + 2007-11-14 19:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbwince.h * harbour/source/common/hbwince.c diff --git a/harbour/make_xmingwce.sh b/harbour/make_xmingwce.sh index 5f2d6836fb..de97bf3688 100755 --- a/harbour/make_xmingwce.sh +++ b/harbour/make_xmingwce.sh @@ -20,10 +20,12 @@ UNAME=`uname -s | tr -d "[-]" 2>/dev/null` if [ "$OSTYPE" = "msdosdjgpp" ]; then HB_HOST_ARCH="dos" + HB_HOST_CC="djgpp" else HB_HOST_ARCH=`echo "$UNAME"|tr '[A-Z]' '[a-z]'` + HB_HOST_CC="gcc" case "$HB_HOST_ARCH" in - *windows*|*mingw32*|msys*) HB_HOST_ARCH="w32" ;; + *windows*|*mingw32*|msys*) HB_HOST_ARCH="w32"; HB_HOST_CC="mingw32" ;; *dos) HB_HOST_ARCH="dos" ;; *bsd) HB_HOST_ARCH="bsd" ;; esac @@ -59,7 +61,7 @@ DIR=`cd $(dirname $0);pwd` if which harbour &> /dev/null; then HB_COMP_PATH=`which harbour 2> /dev/null` else - HB_COMP_PATH="$DIR/source/main/$HB_HOST_ARCH/gcc/harbour" + HB_COMP_PATH="$DIR/source/main/$HB_HOST_ARCH/$HB_HOST_CC/harbour" fi if [ -x "${HB_COMP_PATH}" ]; then ln -s "${HB_COMP_PATH}" ${HB_BIN_COMPILE}/harbour.exe @@ -68,7 +70,7 @@ else exit 1 fi -ln -s "$DIR/source/pp/$HB_HOST_ARCH/gcc/hbppgen" ${HB_BIN_COMPILE}/hbppgen.exe +ln -s "$DIR/source/pp/$HB_HOST_ARCH/$HB_HOST_CC/hbppgen" ${HB_BIN_COMPILE}/hbppgen.exe export HB_PPGEN_PATH=${HB_BIN_COMPILE} case "$1" in