From 2dacc0e733741c608d64a833683cb54261d01322 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 15 Aug 2009 09:49:03 +0000 Subject: [PATCH] 2009-08-15 11:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Minor fix for darwin and automatic entry function detection using 'nm'. nm on Darwin doesn't seem to support '--defined-only -C' option. Przemek, please check this, maybe this hurts functionality. --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbmk2/hbmk2.prg | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0f3b6bd9af..8b93c33275 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-15 11:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Minor fix for darwin and automatic entry function detection using 'nm'. + nm on Darwin doesn't seem to support '--defined-only -C' option. + Przemek, please check this, maybe this hurts functionality. + 2009-08-15 11:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * make_gnu_xmingw.sh * make_gnu_xmingwce.sh diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index ab9a2f8911..1a936ccef8 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -5644,7 +5644,7 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile ) NEXT ELSEIF ! Empty( cExecNM := FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "nm" ) ) cFuncList := "" - hb_processRun( cExecNM + " " + cFile + " -g -n --defined-only -C",, @cFuncList ) + hb_processRun( cExecNM + " " + cFile + " -g -n" + iif( hbmk[ _HBMK_cCOMP ] == "darwin", "", " --defined-only -C" ),, @cFuncList ) IF ( n := At( " T HB_FUN_", cFuncList ) ) != 0 n += 10 DO WHILE ( c := SubStr( cFuncList, n++, 1 ) ) == "_" .OR. ;