diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4b1fe718e4..6918ffae03 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-12-07 17:12 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/bin/hb-mkslib.sh + ! added support for absolute paths in passed object or static library + list + + * harbour/config/bsd/gcc.cf + ! added missing HB_CCACHE in gcc calls + 2008-12-06 19:08 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/makefile * harbour/contrib/gtwvg/common.mak diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh index df90e1c262..6710610533 100755 --- a/harbour/bin/hb-mkslib.sh +++ b/harbour/bin/hb-mkslib.sh @@ -89,14 +89,20 @@ if [ "${SLIB_EXT}" != ".dylib" ]; then do case "${f}" in *.o) - if [ ! -r "${dir}/${f}" ]; then + if [ "${f#/}" == "${f}" ]; then + f="${dir}/${f}" + fi + if [ ! -r "${f}" ]; then echo "cannot read file: ${f}" exit 1 fi cp "${dir}/${f}" "${OTMPDIR}" || exit 1 ;; *.a) - if [ ! -r "${dir}/${f}" ]; then + if [ "${f#/}" == "${f}" ]; then + f="${dir}/${f}" + fi + if [ ! -r "${f}" ]; then echo "cannot read file: ${f}" exit 1 fi diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 7cd97e39f5..c3b61f55e5 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -9,13 +9,13 @@ EXE_EXT = LIB_PREF = lib LIB_EXT = .a -CC = gcc +CC = $(HB_CCACHE) gcc CC_IN = -c CC_OUT = -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = -Wall -W -O3 -LD = gcc +LD = $(HB_CCACHE) gcc LD_OUT = -o # Add all libraries specified in CONTRIBS and LIBS.