From 03eb8b7fd9cf3aa678b6bbe706bdd9ee8d050a73 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sun, 15 May 2011 15:19:50 +0000 Subject: [PATCH] 2011-05-15 17:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/global.mk * harbour/utils/hbmk2/hbmk2.prg ! fixed autodetection of mingw-gcc-tdm64 --- harbour/ChangeLog | 5 +++++ harbour/config/global.mk | 4 ++-- harbour/utils/hbmk2/hbmk2.prg | 8 ++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dc8dc3a2e2..e653af6d37 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2011-05-15 17:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/global.mk + * harbour/utils/hbmk2/hbmk2.prg + ! fixed autodetection of mingw-gcc-tdm64 + 2011-05-15 12:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + contrib/hbunix/sleep.c + missed file diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 5311293b31..b91e2d478c 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -595,11 +595,11 @@ ifeq ($(HB_COMPILER),) HB_CCPOSTFIX := -dw2 else # Equation Solution build (requires x86_64 host) - HB_COMP_PATH := $(call find_in_path,x86_64-pc-mingw32-gcc) + HB_COMP_PATH := $(call find_in_path,x86_64-*-mingw32-gcc) ifneq ($(HB_COMP_PATH),) HB_COMPILER := mingw64 HB_CPU := x86_64 - ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-pc-mingw32-gcc-4.5*),) + ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-*-mingw32-gcc-4.5*),) HB_COMPILER_VER := 45 endif else diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index c8f55becb3..5005cf4ace 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1408,7 +1408,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) { {|| FindInPath( "arm-wince-mingw32ce-gcc" ) }, "mingwarm", "arm-wince-mingw32ce-",, "wce" } ,; { {|| FindInSamePath( "cygstart.exe", "gcc" ) }, "gcc",,, "cygwin" },; { {|| FindInPath( "gcc-dw2" ) }, "mingw", "", "-dw2" },; /* tdragon DWARF-2 build */ - { {|| FindInPath( "x86_64-pc-mingw32-gcc" ) }, "mingw64" },; /* Equation Solution build */ + { {|| FindInPath( "x86_64-pc-mingw32-gcc" ) }, "mingw64" },; /* Equation Solution build */ + { {|| FindInPath( "i686-w64-mingw32-gcc" ) }, "mingw64", "i686-w64-mingw32-" },; /* mingw-w64 build */ + { {|| FindInPath( "x86_64-w64-mingw32-gcc" ) }, "mingw64", "x86_64-w64-mingw32-" },; /* mingw-w64 build */ { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingw" },; { {|| iif( ! Empty( GetEnv( "WATCOM" ) ),; FindInPath( "wcc386" ),; @@ -1426,9 +1428,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) { {|| iif( ( tmp1 := FindInPath( "icl.exe" ) ) != NIL .AND. "itanium" $ Lower( tmp1 ), tmp1, NIL ) }, "iccia64" },; { {|| FindInPath( "icl.exe" ) }, "icc" },; { {|| FindInPath( "xCC.exe" ) }, "xcc" },; - { {|| FindInPath( "dmc.exe" ) }, "dmc" },; - { {|| FindInPath( "i686-w64-mingw32-gcc" ) }, "mingw64", "i686-w64-mingw32-" },; /* mingw-w64 build */ - { {|| FindInPath( "x86_64-w64-mingw32-gcc" ) }, "mingw64", "x86_64-w64-mingw32-" }} /* mingw-w64 build */ + { {|| FindInPath( "dmc.exe" ) }, "dmc" }} #endif aCOMPSUP := { "mingw", "msvc", "bcc", "watcom", "icc", "pocc", "xcc",; "mingw64", "msvc64", "msvcia64", "iccia64", "pocc64" }