From ca55ccf0acb1246271a18be6a76662db706e77f4 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 8 Jul 2011 10:55:38 +0000
Subject: [PATCH] 2011-07-08 12:55 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg   * config/global.mk     + autodetect
 mingw 4.6

---
 harbour/ChangeLog             |  5 +++++
 harbour/config/global.mk      | 12 ++++++++++++
 harbour/utils/hbmk2/hbmk2.prg |  5 ++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3524bf9499..4c8298cd46 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-07-08 12:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/global.mk
+    + autodetect mingw 4.6
+
 2011-07-08 12:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
     + show autodetected HB_CCPREFIX and HB_CCPOSTFIX
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 963f772d7c..19ad68f4f5 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -599,13 +599,20 @@ ifeq ($(HB_COMPILER),)
                         ifneq ($(HB_COMP_PATH),)
                            HB_COMPILER := mingw64
                            HB_CPU := x86_64
+                           ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-*-mingw32-gcc-4.6*),)
+                              HB_COMPILER_VER := 46
+                           else
                            ifneq ($(wildcard $(dir $(HB_COMP_PATH))x86_64-*-mingw32-gcc-4.5*),)
                               HB_COMPILER_VER := 45
                            endif
+                           endif
                         else
                            HB_COMP_PATH := $(call find_in_path,gcc)
                            ifneq ($(HB_COMP_PATH),)
                               HB_COMPILER := mingw
+                              ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.6*),)
+                                 HB_COMPILER_VER := 46
+                              else
                               ifneq ($(wildcard $(dir $(HB_COMP_PATH))mingw32-gcc-4.5*),)
                                  HB_COMPILER_VER := 45
                               else
@@ -621,6 +628,7 @@ ifeq ($(HB_COMPILER),)
                               endif
                               endif
                               endif
+                              endif
                            else
                               HB_COMP_PATH := $(call find_in_path,wcc386)
                               ifneq ($(HB_COMP_PATH),)
@@ -736,9 +744,13 @@ ifeq ($(HB_COMPILER),)
                                                                      HB_COMPILER := mingw64
                                                                      HB_CCPREFIX := i686-w64-mingw32-
                                                                      HB_CPU := x86_64
+                                                                     ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.6*),)
+                                                                        HB_COMPILER_VER := 46
+                                                                     else
                                                                      ifneq ($(wildcard $(dir $(HB_COMP_PATH))$(HB_CCPREFIX)gcc-4.5*),)
                                                                         HB_COMPILER_VER := 45
                                                                      endif
+                                                                     endif
                                                                   else
                                                                      ifeq ($(HB_HOST_CPU),x86_64)
                                                                         # mingw-w64 build
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 4f7039ba4e..6d10fe94df 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1829,7 +1829,10 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
             hbmk[ _HBMK_nCOMPVer ] := 43
          CASE File( hb_FNameDir( cPath_CompC ) + "mingw32-gcc-3.4" + hb_osFileMask() )
             hbmk[ _HBMK_nCOMPVer ] := 34
-         CASE File( hb_FNameDir( cPath_CompC ) + "x86_64-w64-mingw32-gcc-4.6" + hb_osFileMask() )
+         CASE File( hb_FNameDir( cPath_CompC ) + "mingw32-gcc-4.6" + hb_osFileMask() ) .OR. ;
+              File( hb_FNameDir( cPath_CompC ) + "i686-w64-mingw32-gcc-4.6" + hb_osFileMask() ) .OR. ;
+              File( hb_FNameDir( cPath_CompC ) + "x86_64-pc-mingw32-gcc-4.6" + hb_osFileMask() ) .OR. ;
+              File( hb_FNameDir( cPath_CompC ) + "x86_64-w64-mingw32-gcc-4.6" + hb_osFileMask() )
             hbmk[ _HBMK_nCOMPVer ] := 46
          ENDCASE