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

2009-08-20 00:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/config/global.mk
    ! fixed typo in platform detection 'ifeq' instead of 'ifneq' and 'win'
      was set as default
    ! replaced wrongly used 'findstring' functions with 'filter' functions
    ! added small trick in path prefix detection to avoid false results
      from 'findstring' function
    ! look for 'suncc' instead of 'cc' detecting SunPRO C compiler
      ('cc' is default C compiler link in all *nixes)
This commit is contained in:
Przemyslaw Czerpak
2009-08-19 22:52:57 +00:00
parent 19d6c252b9
commit 8bd403daa5
2 changed files with 21 additions and 10 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-08-20 00:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/config/global.mk
! fixed typo in platform detection 'ifeq' instead of 'ifneq' and 'win'
was set as default
! replaced wrongly used 'findstring' functions with 'filter' functions
! added small trick in path prefix detection to avoid false results
from 'findstring' function
! look for 'suncc' instead of 'cc' detecting SunPRO C compiler
('cc' is default C compiler link in all *nixes)
2009-08-20 00:03 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/bin/hb-func.sh
* use -I<path> parameter passed to Harbour compiler in hb* scripts

21
harbour/config/global.mk
View File

@@ -26,6 +26,7 @@
# TOFIX: $(realpath/abspath) need GNU Make 3.81 or upper
# TOFIX: $(eval) needs GNU Make 3.80 or upper
ifeq ($(GLOBAL_CF_),)
GLOBAL_CF_ := yes
@@ -193,10 +194,10 @@ ifeq ($(HB_INIT_DONE),)
ifeq ($(HB_BUILD_PKG),yes)
# 'clean' and 'install' are required when building a release package
ifeq ($(findstring clean,$(HB_MAKECMDGOALS)),)
ifeq ($(filter clean,$(HB_MAKECMDGOALS)),)
export HB_BUILD_PKG := no
else
ifeq ($(findstring install,$(HB_MAKECMDGOALS)),)
ifeq ($(filter install,$(HB_MAKECMDGOALS)),)
export HB_BUILD_PKG := no
else
ifneq ($(ROOT),./)
@@ -402,7 +403,7 @@ ifeq ($(HB_INIT_DONE),)
endif
endif
ifneq ($(findstring $(HB_HOST_ARCH),win wce dos os2),)
ifneq ($(filter $(HB_HOST_ARCH),win wce dos os2),)
HB_HOST_BIN_EXT := .exe
else
HB_HOST_BIN_EXT :=
@@ -463,7 +464,7 @@ ifeq ($(HB_ARCHITECTURE),)
ifeq ($(HB_COMPILER),djgpp)
HB_ARCHITECTURE := dos
else
ifeq ($(findstring $(HB_COMPILER),mingw mingw64 msvc msvc64 msvcia64 bcc xcc pocc pocc64),)
ifneq ($(filter $(HB_COMPILER),mingw mingw64 msvc msvc64 msvcia64 bcc xcc pocc pocc64),)
HB_ARCHITECTURE := win
endif
endif
@@ -641,13 +642,13 @@ ifeq ($(HB_COMPILER),)
endif
endif
else
ifneq ($(findstring $(HB_ARCHITECTURE),darwin hpux bsd),)
ifneq ($(filter $(HB_ARCHITECTURE),darwin hpux bsd),)
ifneq ($(call find_in_path,gcc),)
HB_COMPILER := gcc
endif
else
ifeq ($(HB_ARCHITECTURE),sunos)
ifneq ($(call find_in_path,cc),)
ifneq ($(call find_in_path,suncc),)
HB_COMPILER := sunpro
else
ifneq ($(call find_in_path,gcc),)
@@ -752,7 +753,7 @@ ifeq ($(HB_BUILD_VERBOSE),yes)
endif
endif
ifneq ($(findstring $(HB_ARCHITECTURE),win wce dos os2),)
ifneq ($(filter $(HB_ARCHITECTURE),win wce dos os2),)
HB_OS_UNIX := no
else
HB_OS_UNIX := yes
@@ -999,13 +1000,13 @@ ifneq ($(HB_INSTALL_PREFIX),)
LIBPOSTFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(ARCH_COMP))
else
# Not perfect, please enhance it.
ifneq ($(findstring /usr,$(HB_INSTALL_PREFIX)),)
ifeq ($(findstring /usr/home,$(HB_INSTALL_PREFIX)),)
ifneq ($(findstring |/usr,|$(HB_INSTALL_PREFIX)),)
ifeq ($(findstring |/usr/home,|$(HB_INSTALL_PREFIX)),)
LIBPOSTFIX := $(DIRSEP)harbour
INCPOSTFIX := $(DIRSEP)harbour
endif
else
ifneq ($(findstring /opt,$(HB_INSTALL_PREFIX)),)
ifneq ($(findstring |/opt,|$(HB_INSTALL_PREFIX)),)
LIBPOSTFIX := $(DIRSEP)harbour
INCPOSTFIX := $(DIRSEP)harbour
endif