From 432a76083eec53a84489d3e70baa1891a96a13ce Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 10 Feb 2010 14:40:44 +0000
Subject: [PATCH] 2010-02-10 15:37 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     + Enabled -implib option in -hbexe
 (default) mode.       (except for dos/djgpp, pls add it manually)     +
 Enabled -map option in -hbdyn mode for some targets where it was missing.    
   (except for dos/djgpp, pls review this case)

---
 harbour/ChangeLog             |  7 +++++++
 harbour/utils/hbmk2/hbmk2.prg | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0bfd5bdd1d..1810c44d22 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-10 15:37 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Enabled -implib option in -hbexe (default) mode.
+      (except for dos/djgpp, pls add it manually)
+    + Enabled -map option in -hbdyn mode for some targets where it was missing.
+      (except for dos/djgpp, pls review this case)
+
 2010-02-10 14:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/binnum.c
   * src/rtl/ampm.c
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 6910cb3434..baf7f330a8 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2386,8 +2386,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          IF hbmk[ _HBMK_lMAP ]
             IF hbmk[ _HBMK_cPLAT ] == "darwin"
                AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-map,{OM}" )
+               AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,-map,{OM}" )
             ELSE
                AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map,{OM}" )
+               AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,-Map,{OM}" )
             ENDIF
          ENDIF
          IF hbmk[ _HBMK_lSTATICFULL ]
@@ -2577,8 +2579,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          ENDIF
          IF hbmk[ _HBMK_lMAP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map,{OM}" )
+            AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,-Map,{OM}" )
          ENDIF
          IF hbmk[ _HBMK_lIMPLIB ]
+            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,--out-implib,{OI}" )
             AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,--out-implib,{OI}" )
          ENDIF
          IF l_lLIBGROUPING .AND. hbmk[ _HBMK_cCOMP ] $ "mingw|mingw64|mingwarm"
@@ -2691,8 +2695,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          cOpt_Lib := "{FA} rcs {OL} {LO}"
          IF hbmk[ _HBMK_lMAP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map,{OM}" )
+            AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,-Map,{OM}" )
          ENDIF
          IF hbmk[ _HBMK_lIMPLIB ]
+            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,--out-implib,{OI}" )
             AAdd( hbmk[ _HBMK_aOPTD ], "-Wl,--out-implib,{OI}" )
          ENDIF
          AAdd( hbmk[ _HBMK_aOPTL ], "{LL} {LB}" )
@@ -2948,6 +2954,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTD ], "OP map" )
          ENDIF
          IF hbmk[ _HBMK_lIMPLIB ] .AND. hbmk[ _HBMK_cPLAT ] $ "win|os2"
+            AAdd( hbmk[ _HBMK_aOPTL ], "OP implib={OI}" )
             AAdd( hbmk[ _HBMK_aOPTD ], "OP implib={OI}" )
          ENDIF
          IF hbmk[ _HBMK_cPLAT ] $ "win|os2|dos"
@@ -3045,6 +3052,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTD ], "-ap" )
          ENDIF
          IF hbmk[ _HBMK_lIMPLIB ]
+            AAdd( hbmk[ _HBMK_aOPTL ], "-Gi" )
             AAdd( hbmk[ _HBMK_aOPTD ], "-Gi" )
          ENDIF
          IF ! Empty( cWorkDir )
@@ -3172,6 +3180,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTD ], "-map" )
          ENDIF
          IF hbmk[ _HBMK_lIMPLIB ]
+            AAdd( hbmk[ _HBMK_aOPTL ], "-implib:{OI}" )
             AAdd( hbmk[ _HBMK_aOPTD ], "-implib:{OI}" )
          ENDIF
          IF hbmk[ _HBMK_cPLAT ] == "wce"
@@ -3307,8 +3316,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          cLibPathSep := " "
          IF hbmk[ _HBMK_lMAP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-map" )
+            AAdd( hbmk[ _HBMK_aOPTD ], "-map" )
          ENDIF
          IF hbmk[ _HBMK_lIMPLIB ]
+            AAdd( hbmk[ _HBMK_aOPTL ], "-implib:{OI}" )
             AAdd( hbmk[ _HBMK_aOPTD ], "-implib:{OI}" )
          ENDIF
          IF hbmk[ _HBMK_lDEBUG ]
@@ -3379,6 +3390,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          ENDIF
          IF hbmk[ _HBMK_lMAP ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-M{OM}" )
+            AAdd( hbmk[ _HBMK_aOPTD ], "-M{OM}" )
          ENDIF
          IF hbmk[ _HBMK_lSTATICFULL ]
             AAdd( hbmk[ _HBMK_aOPTL ], "-B -static" )
@@ -4530,6 +4542,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
                cOpt_Link := StrTran( cOpt_Link, "{LB}"  , ArrayToList( l_aLIBA,, nOpt_Esc ) )
                cOpt_Link := StrTran( cOpt_Link, "{OE}"  , FN_Escape( PathSepToTarget( hbmk, l_cPROGNAME ), nOpt_Esc ) )
                cOpt_Link := StrTran( cOpt_Link, "{OM}"  , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, ".map" ) ), nOpt_Esc ) )
+               cOpt_Link := StrTran( cOpt_Link, "{OI}"  , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, cLibLibExt ) ), nOpt_Esc ) )
                cOpt_Link := StrTran( cOpt_Link, "{DL}"  , ArrayToList( hbmk[ _HBMK_aLIBPATH ], cLibPathSep, nOpt_Esc, cLibPathPrefix ) )
                cOpt_Link := StrTran( cOpt_Link, "{DB}"  , l_cHB_BIN_INSTALL )