From d2d78e7d7c45be8ce9f419367c8d77490d59e740 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 3 Oct 2009 18:05:26 +0000
Subject: [PATCH] 2009-10-03 20:02 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * INSTALL     ! Minor fix to OS/2 example.

  * utils/hbmk2/hbmk2.prg
  * config/os2/gcc.mk
    ! Fixed to use 'stripomf' tool instead of 'strip' in gccomf mode.

  ; Please only post comments on above patch if it contains real
    information. I'm not interested in "This is wrong.", "You messed it up."
    kind of comments, only in real information, since I'm not OS/2 user.
---
 harbour/ChangeLog             | 12 ++++++++++++
 harbour/INSTALL               |  2 +-
 harbour/config/os2/gcc.mk     |  6 +++++-
 harbour/utils/hbmk2/hbmk2.prg |  6 +++++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3f45031a1c..02003603eb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-03 20:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    ! Minor fix to OS/2 example.
+
+  * utils/hbmk2/hbmk2.prg
+  * config/os2/gcc.mk
+    ! Fixed to use 'stripomf' tool instead of 'strip' in gccomf mode.
+
+  ; Please only post comments on above patch if it contains real 
+    information. I'm not interested in "This is wrong.", "You messed it up." 
+    kind of comments, only in real information, since I'm not OS/2 user.
+
 2009-10-03 13:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     + Added MSVC Itanium build example.
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 17888418a6..eec30e1e81 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -869,7 +869,7 @@ HARBOUR
       os2-make
 
       --- GCC 4.x
-      C:\usr\local433\gccenv.cmd
+      C:\usr\local433\gcc440.cmd
       set HB_COMPILER=gccomf
       os2-make
 
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 905cd1efe7..dc6640503e 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -43,7 +43,11 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 endif
 
 ifneq ($(filter $(HB_BUILD_STRIP),all lib),)
-   ARSTRIP = & ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
+   ifeq ($(HB_COMPILER),gccomf)
+      ARSTRIP = & ${HB_CCPATH}${HB_CCPREFIX}stripomf -S $(LIB_DIR)/$@
+   else
+      ARSTRIP = & ${HB_CCPATH}${HB_CCPREFIX}strip -S $(LIB_DIR)/$@
+   endif
 endif
 ifneq ($(filter $(HB_BUILD_STRIP),all bin),)
    LDSTRIP := -s
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index d644ded6a1..5e6a1e3dad 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2464,7 +2464,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
          IF hbmk[ _HBMK_lSTRIP ]
             IF lCreateLib
-               cBin_Post := "strip"
+               IF hbmk[ _HBMK_cCOMP ] == "gccomf"
+                  cBin_Post := "stripomf"
+               ELSE
+                  cBin_Post := "strip"
+               ENDIF
                cOpt_Post := "-S {OB}"
             ELSE
                AAdd( hbmk[ _HBMK_aOPTL ], "-s" )