From ae81a3de537f48b5f78f24d74f576ad270cc86f2 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 14 Oct 2009 15:19:16 +0000 Subject: [PATCH] 2009-10-14 17:18 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-func.sh ! do not look for .c files as result of hbcmp script executed with -s or -sm switch and without -g[oh] * switches. --- harbour/ChangeLog | 5 +++++ harbour/bin/hb-func.sh | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b347193d9c..4ce698af23 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-14 17:18 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/bin/hb-func.sh + ! do not look for .c files as result of hbcmp script executed + with -s or -sm switch and without -g[oh] * switches. + 2009-10-14 13:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added 'gcc -MM' based C header dependency detection in -head=native mode. diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 01a3a24068..7315bfcdb7 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -379,6 +379,7 @@ HB_HWGUI="" HB_USRLIBS="" HB_USRLPATH="" HB_GEN="" +HB_NOC="" HB_MODE="" HB_EXIT="" LN_OPT="${CC_HB_USER_LDFLAGS}" @@ -429,6 +430,7 @@ while [ \$n -lt \${#P[@]} ]; do -g[cohwij]) HB_GEN="\${v#-g}"; p="\${v}" ;; -gc[0-9]) HB_GEN="c"; p="\${v}" ;; -go[0-9]) HB_GEN="o"; p="\${v}" ;; + -sm|-s) [ \${HB} != "cmp" ] || HB_NOC="yes"; p="\${v}" ;; --hbdirlib) echo "\${HB_LIB_INSTALL}"; HB_EXIT="yes" ;; --hbdirinc) echo "\${HB_INC_INSTALL}"; HB_EXIT="yes" ;; --hbdirbin) echo "\${HB_BIN_INSTALL}"; HB_EXIT="yes" ;; @@ -673,7 +675,7 @@ hb_cc() hb_cmp() { ${hb_cmpname} "\$@" \${HB_OPT} \${HB_PATHS} && \\ - ( [ "\${HB_GEN//c/}" != "" ] || \\ + ( [ "\${HB_GEN//c/}" != "" ] || [ "\${HB_NOC}" = "yes" ] || \\ ( [ -f "\${FOUTC}" ] && \\ hb_cc -c "\${FOUTC}" -o "\${FOUTO}" && \\ ( [ "\${HB_GEN}" = "c" ] || rm -f "\${FOUTC}" ) ) )