From 63e13d35918af6a3f263fe536750a107491a0e39 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 18 Feb 2013 14:33:21 +0000 Subject: [PATCH] 2013-02-18 15:32 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg ! yuck --- harbour/ChangeLog.txt | 4 ++++ harbour/utils/hbmk2/hbmk2.prg | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 2a8b6f3bdb..37001df32d 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-02-18 15:32 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + ! yuck + 2013-02-18 15:29 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg ! weird editing typo in a recent HB_STRREPLACE() related diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index d7085252ca..5ba7773363 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -6811,7 +6811,7 @@ FUNCTION hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExitStr ) /* TODO: eliminate recursive macros from hbmk[ _HBMK_aOPTL ] */ cOpt_Link := StrTran( cOpt_Link, "{FL}", iif( hbmk[ _HBMK_lBLDFLGL ], hb_Version( HB_VERSION_FLAG_LINKER ) + " ", "" ) +; GetEnv( "HB_USER_LDFLAGS" ) +; - iif( Empty( hbmk[ _HBMK_aOPTL ] ), "", " " + ArrayToList( hbmk[ _HBMK_aOPTL ] ) ) + iif( Empty( hbmk[ _HBMK_aOPTL ] ), "", " " + ArrayToList( hbmk[ _HBMK_aOPTL ] ) ) ) cOpt_Link := AllTrim( hb_StrReplace( cOpt_Link, { ; "{LO}" => ArrayToList( ArrayJoin( l_aOBJ, hbmk[ _HBMK_aOBJUSER ] ),, nOpt_Esc, nOpt_FNF, cObjPrefix ), ;