From 87fafe4adeb332af88149adbbb0ec8c3e9473bf0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 22 Apr 2011 14:29:59 +0000 Subject: [PATCH] 2011-04-22 16:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + config/minix/clang.mk + Added new compiler for minix. [Tamas Tevesz] * utils/hbmk2/hbmk2.prg * INSTALL + Added minix/clang. - Deleted minix/pcc references. --- harbour/ChangeLog | 15 ++++++++-- harbour/INSTALL | 1 + harbour/config/minix/clang.mk | 55 +++++++++++++++++++++++++++++++++++ harbour/utils/hbmk2/hbmk2.prg | 5 ++-- 4 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 harbour/config/minix/clang.mk diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 53eb3dfe53..eb04e40949 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-22 16:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + + config/minix/clang.mk + + Added new compiler for minix. [Tamas Tevesz] + + * utils/hbmk2/hbmk2.prg + * INSTALL + + Added minix/clang. + - Deleted minix/pcc references. + 2011-04-21 19:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Typo in prev for djgpp/C++. @@ -32,14 +41,14 @@ 2011-04-21 16:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * ChangeLog - ! Addes missing change to 2011-04-21 01:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu): + ! Added missing change to 2011-04-21 01:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu): * src/rtl/gtwin/gtwin.c ! Reverted optimization patch in 2011-03-30 14:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) It caused strange effects ( key causing INKEY() to return on some national keysets or some other region related attributes, it was reported by few - users from Brazil. + users from Brazil.) 2011-04-21 10:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/harbour.hbx @@ -95,7 +104,7 @@ It caused strange effects ( key causing INKEY() to return on some national keysets or some other region related attributes, it was reported by few - users from Brazil. + users from Brazil.) * contrib/hbmxml/3rd/minixml/mxml.hbp * contrib/hbmxml/3rd/minixml/mxml_str.c diff --git a/harbour/INSTALL b/harbour/INSTALL index cfd5152a97..951136feee 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -1426,6 +1426,7 @@ HARBOUR x hpux -> win/mingw x86 x hpux -> dos/djgpp x86 minix -> minix/gcc x86 + minix -> minix/clang x86 minix -> minix/ack x86 sunos -> sunos/gcc (CPU cross-builds possible) sunos -> sunos/sunpro (CPU cross-builds possible: x86, x86-64, sparc32, sparc64) diff --git a/harbour/config/minix/clang.mk b/harbour/config/minix/clang.mk new file mode 100644 index 0000000000..c361c07594 --- /dev/null +++ b/harbour/config/minix/clang.mk @@ -0,0 +1,55 @@ +# +# $Id$ +# + +ifeq ($(HB_BUILD_MODE),cpp) + HB_CMP := clang++ +else + HB_CMP := clang +endif + +HB_BUILD_SHARED := no +HB_BUILD_DYN := no + +OBJ_EXT := .o +LIB_PREF := lib +LIB_EXT := .a + +## HB_DYN_COPT := -DHB_DYNLIB -fPIC + +CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX) +ifneq ($(filter --analyze, $(HB_USER_CFLAGS)),) + CC_IN := +else + CC_IN := -c +endif +CC_OUT := -o + +CFLAGS += -I. -I$(HB_HOST_INC) + +ifneq ($(HB_BUILD_WARN),no) + CFLAGS += -W -Wall +else + CFLAGS += -W +endif + +ifneq ($(HB_BUILD_OPTIM),no) + CFLAGS += -O3 +endif + +ifeq ($(HB_BUILD_DEBUG),yes) + CFLAGS += -g +endif + +LD := $(CC) +LD_OUT := -o + +LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir)) +LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib)) + +LDFLAGS += $(LIBPATHS) + +AR := $(HB_CCPREFIX)ar +AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && $(FALSE) ) + +include $(TOP)$(ROOT)config/rules.mk diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index a05336f0a7..e4e099fa18 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1342,7 +1342,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE hbmk[ _HBMK_cPLAT ] == "aix" aCOMPSUP := { "gcc", "icc" } case hbmk[ _HBMK_cPLAT ] == "minix" - aCOMPSUP := { "gcc", "ack", "pcc" } + aCOMPSUP := { "gcc", "clang", "ack" } OTHERWISE aCOMPSUP := { "gcc" } ENDCASE @@ -3269,6 +3269,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ( hbmk[ _HBMK_cPLAT ] == "linux" .AND. hbmk[ _HBMK_cCOMP ] == "clang" ) .OR. ; ( hbmk[ _HBMK_cPLAT ] == "darwin" .AND. hbmk[ _HBMK_cCOMP ] == "clang" ) .OR. ; ( hbmk[ _HBMK_cPLAT ] == "bsd" .AND. hbmk[ _HBMK_cCOMP ] == "clang" ) .OR. ; + ( hbmk[ _HBMK_cPLAT ] == "minix" .AND. hbmk[ _HBMK_cCOMP ] == "clang" ) .OR. ; ( hbmk[ _HBMK_cPLAT ] == "beos" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ; ( hbmk[ _HBMK_cPLAT ] == "qnx" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ; ( hbmk[ _HBMK_cPLAT ] == "android" .AND. hbmk[ _HBMK_cCOMP ] == "gcc" ) .OR. ; @@ -12026,7 +12027,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) " - vxworks : gcc, diab",; " - symbian : gcc",; " - cygwin : gcc",; - " - minix : gcc, ack, pcc",; + " - minix : gcc, clang, ack",; " - sunos : gcc, sunpro, pcc" } LOCAL aOpt_Basic := {;