fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-07-17 09:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* make_gnu.sh
    ! Changed to use gmake on all sunos systems.

  * utils/hbmk2/hbmk2.prg
  * config/sunos/gcc.cf
    ! Added space after -o CC option. Required by some sunos systems.

  ; Thanks for valuable input and testing to Tamas Tevesz.
This commit is contained in:
Viktor Szakats
2009-07-17 07:05:54 +00:00
parent 1645cb3f1c
commit 945c26d396
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-17 09:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* make_gnu.sh
! Changed to use gmake on all sunos systems.
* utils/hbmk2/hbmk2.prg
* config/sunos/gcc.cf
! Added space after -o CC option. Required by some sunos systems.
; Thanks for valuable input and testing to Tamas Tevesz.
2009-07-17 02:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/instsh.cf
* shell/nt rule $(MD) -> $(MDP). (just for clarity)

5
harbour/config/sunos/gcc.cf
View File

@@ -15,7 +15,10 @@ LIB_EXT = .a
CC = $(HB_CCACHE) $(HB_CMP)
CC_IN = -c
CC_OUT = -o
# NOTE: The ending space after -o is important, please preserve it.
# Now solved with '$(subst x,x, )' expression.
CC_OUT = -o$(subst x,x, )
CPPFLAGS = -I. -I$(HB_INC_COMPILE)
CFLAGS =

14
harbour/make_gnu.sh
View File

@@ -157,12 +157,14 @@ else
# ---------------------------------------------------------------
# Start the GNU make system
if [ "$HB_ARCHITECTURE" = "bsd" ] || [ "$HB_ARCHITECTURE" = "hpux" ]
then
gmake $HB_USER_MAKEFLAGS $*
else
make $HB_USER_MAKEFLAGS $*
fi
case "$HB_ARCHITECTURE" in
bsd|hpux|sunos)
gmake $HB_USER_MAKEFLAGS $*
;;
*)
make $HB_USER_MAKEFLAGS $*
;;
esac
if [ "$*" = "clean" ]; then
find . -type d -name "$HB_ARCHITECTURE" | xargs rmdir 2> /dev/null

4
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -2135,14 +2135,14 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
ENDIF
IF lStopAfterCComp
IF ! lCreateLib .AND. ! lCreateDyn .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
IF hbmk[ _HBMK_cARCH ] == "darwin"
IF hbmk[ _HBMK_cARCH ] $ "darwin|sunos"
AAdd( hbmk[ _HBMK_aOPTC ], "-o {OO}" )
ELSE
AAdd( hbmk[ _HBMK_aOPTC ], "-o{OO}" )
ENDIF
ENDIF
ELSE
IF hbmk[ _HBMK_cARCH ] == "darwin"
IF hbmk[ _HBMK_cARCH ] $ "darwin|sunos"
AAdd( hbmk[ _HBMK_aOPTL ], "-o {OE}" )
ELSE
AAdd( hbmk[ _HBMK_aOPTL ], "-o{OE}" )